Merge remote-tracking branch 'origin/master'

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceiveMapper.xml

@@ -47,7 +47,7 @@
         wt_sp_receive wr
         JOIN wt_sp_warehouse sw ON wr.STORAGE_ROOM = sw.id
         <if test="params.code!=null and params.code!=''">
-            and wr.code = #{params.code}
+            and wr.code like  concat('%',#{params.code},'%')
         </if>
         <if test="params.createUser!=null">
             and wr.CREATE_USER = #{params.createUser}

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpTotalMapper.xml

@@ -71,7 +71,7 @@
             join wt_sp_management sm on sb.MANAGEMENT_ID = sm.id
         where st.IS_DELETED = 0
         <if test="params.code!=null and params.code!=''">
-            and sb.code = #{params.code}
+            and sb.code like  concat('%',#{params.code},'%')
         </if>
         <if test="params.name!=null and params.name!=''">
             and sb.NAME like concat('%',#{params.name},'%')

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpReceiveServiceImpl.java

@@ -15,7 +15,6 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springblade.core.launch.constant.FlowConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -23,9 +22,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.feign.ISysClient;
@@ -34,14 +31,12 @@ import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  *  服务实现类
@@ -236,7 +231,7 @@ public class SpReceiveServiceImpl extends BaseServiceImpl<SpReceiveMapper, SpRec
         if(null!=receiveVO.getUserName()){
             R<User> user = userClient.userByAccount(bladeUser.getTenantId(),receiveVO.getUserName());
             if(null!=user){
-                if(null!=user.getData().getId()){
+                if(null!=user.getData()){
                     params.put("createUser",user.getData().getId());
                 }else{
                     return page.setRecords(result);