diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java index 760e55759..addf1bb3b 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrDeptController.java @@ -113,7 +113,7 @@ public class ThrDeptController { filterThrDeptRequest.setName(thrDeptEntity.getName()); filterThrDeptRequest.setThirdSysFk(thrDeptEntity.getThirdSysFk()); filterThrDeptRequest.setStatus(thrDeptEntity.getStatus()); - if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getCode(), thrDeptEntity.getId())) { + if (!thrDeptService.editExit(thrDeptEntity.getCode(), thrDeptEntity.getThirdSysFk(), thrDeptEntity.getId())) { thrDeptEntity.setPid(null); // 不能修改父级 pid thrDeptEntity.setUpdateTime(new Date()); boolean b = thrDeptService.updateInvWarehouse(thrDeptEntity); diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 30f544330..43d5bc63d 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -84,9 +84,6 @@ AND thirdSysFk = #{thirdSysFk} - - AND thirdSys = #{thirdSys} - AND supName LIKE = #{supName}