第三方产品选入bug修改提交

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -302,6 +302,7 @@ public class ThrProductsAddDiController {
         if (null == thrProductsAdddiEntity)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
 
+
         if (thrProductsService.isExit(thrProductsAdddiEntity.getCode(), thrProductsAdddiEntity.getThirdSysFk())) {
             return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！");
         }

src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java

@@ -41,4 +41,6 @@ public interface ThrProductsAddDiDao {
 
 
     boolean insert(ThrProductsAddDiEntity thrProductsAddDiEntity);
+
+    List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
 }

src/main/java/com/glxp/api/service/thrsys/ThrProductsAddDiService.java

@@ -34,4 +34,6 @@ public interface ThrProductsAddDiService {
     ThrProductsAddDiEntity filterThrProductsGetId( Integer id);
 
     boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity);
+
+    List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java

@@ -130,4 +130,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
     public boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity) {
         return thrProductsAddDiDao.insert(thrProductsAddDiEntity);
     }
+
+    @Override
+    public List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest) {
+        return thrProductsAddDiDao.filterThrProductsDiList(filterThrProductsRequest);
+    }
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -7,7 +7,9 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.dao.thrsys.ThrProductsDao;
 import com.glxp.api.req.thrsys.FilterThrProductsRequest;
+import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
 import com.glxp.api.res.thrsys.ThrProductsResponse;
+import com.glxp.api.service.thrsys.ThrProductsAddDiService;
 import com.glxp.api.service.thrsys.ThrProductsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -29,6 +31,8 @@ public class ThrProductsServiceImpl implements ThrProductsService {
 
     @Resource
     ThrProductsDao thrProductsDao;
+    @Resource
+    ThrProductsAddDiService thrProductsAddDiService;
 
     @Override
     public ThrProductsEntity selectByCode(String code) {
@@ -98,11 +102,13 @@ public class ThrProductsServiceImpl implements ThrProductsService {
 
     @Override
     public Boolean isExit(String code, String thirdIdFk) {
+        //判断di表有没有该产品数据
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
         filterThrProductsRequest.setThirdSysFk(thirdIdFk);
         filterThrProductsRequest.setCode(code);
+        List<ThrProductsAddDiResponse> filterThrProductsDiList=thrProductsAddDiService.filterThrProductsDiList(filterThrProductsRequest);
         List<ThrProductsEntity> data = thrProductsDao.selectThrProducts(filterThrProductsRequest);
-        if (CollUtil.isNotEmpty(data)) {
+        if (CollUtil.isNotEmpty(data) || CollUtil.isNotEmpty(filterThrProductsDiList)) {
             return true;
         }
         return false;

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -183,5 +183,19 @@
         )
     </insert>
 
+    <select id="filterThrProductsDiList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
+            resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
+        SELECT tdi.*
+        FROM thr_products_add_di tdi
+        <where>
+            <if test="thirdSysFk != null">
+                AND tdi.thirdSysFk = #{thirdSysFk}
+            </if>
+            <if test="code != null">
+                AND tdi.code = #{code}
+            </if>
+        </where>
+    </select>
+
 
 </mapper>