1.修复异常单据码详情选择供应商查询无法使用名称查询的问题

api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java

@@ -6,7 +6,6 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
-import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.exception.JsonException;
 import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest;
@@ -105,7 +104,7 @@ public class CompanyProductRelevanceController {
             for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) {
                 erpIds.add(companyProductRelevanceEntity.getUnitFk());
             }
-            List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIds(erpIds);
+            List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIdsAndName(erpIds, filterCompanyProductRelevanceRequest.getKey());
             return ResultVOUtils.success(basicUnitMaintainEntities);
         }
         return ResultVOUtils.error(500, "该产品未关联供应商！");

api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java

@@ -33,4 +33,6 @@ public interface BasicUnitMaintainDao {
 
 
     boolean importBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity);
+
+    List<BasicUnitMaintainEntity> batchSelectByErpIdsAndName(@Param("erpIds") List<String> erpIds, @Param("name") String name);
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java

@@ -12,4 +12,6 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
     private String udiRlIdFk;
     private String unitFk;
     private String lastUpdateTime;
+
+    private String key;
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java

@@ -3,7 +3,6 @@ package com.glxp.api.admin.service.basic;
 
 import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
-import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest;
 
 import java.util.List;
 
@@ -38,4 +37,5 @@ public interface BasicUnitMaintainService {
 
     List<BasicUnitMaintainEntity> batchSelectByErpIds(List<String> erpIds);
 
+    List<BasicUnitMaintainEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name);
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java

@@ -87,6 +87,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
         return basicUnitMaintainDao.batchSelectByErpIds(erpIds);
     }
 
+    @Override
+    public List<BasicUnitMaintainEntity> batchSelectByErpIdsAndName(List<String> erpIds, String name) {
+        return basicUnitMaintainDao.batchSelectByErpIdsAndName(erpIds, name);
+    }
+
     @Override
     public BasicUnitMaintainEntity selectById(String id) {
         return basicUnitMaintainDao.selectById(id);

api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml

@@ -257,4 +257,20 @@
         #{outType}
         )
     </insert>
+
+    <select id="batchSelectByErpIdsAndName" resultType="com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity">
+        select *
+        from basic_corp
+        <where>
+            <if test="name != null and name != ''">
+                AND name like concat('%', #{name}, '%')
+            </if>
+            <if test="erpIds != null and erpIds.size() != 0">
+               AND erpId in
+                <foreach collection="erpIds" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>