修改第三方数据 单据类型新增 编辑问题

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

@@ -1,7 +1,6 @@
 package com.glxp.api.controller.thrsys;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -106,7 +105,7 @@ public class ThrBusTypeOriginController {
         }
         if (thrBusTypeOriginEntity != null) {
 //            校验单据类型代码是否重复
-            boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys());
+            boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getId(),thrBusTypeOriginEntity.getName(),thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys());
             if (exists) {
                 return ResultVOUtils.error(500, "单据类型已存在！");
             }
@@ -131,7 +130,7 @@ public class ThrBusTypeOriginController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (thrBusTypeOriginEntity != null) {
-            boolean exists = thrBusTypeOriginService.checkActionExists(thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys());
+            boolean exists = thrBusTypeOriginService.addCheckActionExists(thrBusTypeOriginEntity.getName(),thrBusTypeOriginEntity.getAction(), thrBusTypeOriginEntity.getThirdSys());
             if (exists) {
                 return ResultVOUtils.error(500, "单据类型已存在！");
             }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java

@@ -85,7 +85,7 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
     public boolean verifyExists(BasicBusTypePreEntity basicBusTypePreEntity) {
         QueryWrapper<BasicBusTypePreEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("action", basicBusTypePreEntity.getAction())
-//                .eq("originAction", basicBusTypePreEntity.getOriginAction())
+                .eq("originAction", basicBusTypePreEntity.getOriginAction())
                 .eq(null !=basicBusTypePreEntity.getInvCode(),"invCode", basicBusTypePreEntity.getInvCode())
                 .eq(null != basicBusTypePreEntity.getBeforeTime(), "beforeTime", basicBusTypePreEntity.getBeforeTime())
                 .eq(null != basicBusTypePreEntity.getDefaultInvCode(), "defaultInvCode", basicBusTypePreEntity.getDefaultInvCode())

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

@@ -53,7 +53,9 @@ public interface IThrBusTypeOriginService extends IService<ThrBusTypeOriginEntit
      * @param thirdSys
      * @return
      */
-    boolean checkActionExists(String action, String thirdSys);
+    boolean addCheckActionExists(String name,String action, String thirdSys);
+
+    boolean checkActionExists(Long id,String name,String action, String thirdSys);
 
     /**
      * 更新第三方单据类型

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

@@ -79,8 +79,17 @@ public class ThrBusTypeOriginServiceImpl extends ServiceImpl<ThrBusTypeOriginDao
     }
 
     @Override
-    public boolean checkActionExists(String action, String thirdSys) {
-        List<ThrBusTypeOriginEntity> count = thrBusTypeOriginDao.selectList(new QueryWrapper<ThrBusTypeOriginEntity>().eq("action", action).eq("thirdSys", thirdSys));
+    public boolean addCheckActionExists(String name,String action, String thirdSys) {
+        List<ThrBusTypeOriginEntity> count = thrBusTypeOriginDao.selectList(new QueryWrapper<ThrBusTypeOriginEntity>().eq("action", action).or().eq("name",name).eq("thirdSys", thirdSys));
+        if (count.size() > 0) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean checkActionExists(Long id,String name, String action, String thirdSys) {
+        List<ThrBusTypeOriginEntity> count = thrBusTypeOriginDao.selectList(new QueryWrapper<ThrBusTypeOriginEntity>().eq("action", action).eq("thirdSys", thirdSys).eq("name",name).ne("id",id));
         if (count.size() > 0) {
             return true;
         }