diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index 7adbd3a8..15391122 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -255,7 +255,7 @@ public class DeptController extends BaseController { return ResultVOUtils.error(999, msg); } //判断供应商状态 - if (deptEntity.isSpUse() == false) { + if (deptEntity.getSpUse() == false) { FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 388345b6..2a771834 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -257,6 +257,10 @@ public class ThrProductsAddDiController { thrProductsAddDiEntity.setRemark(remark); thrProductsAddDiEntity.setStatus(status); thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); + }else { + thrProductsAddDiEntity.setRemark(remark); + thrProductsAddDiEntity.setStatus(status); + thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); } return ResultVOUtils.success("更新成功"); } diff --git a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java index bfd382a0..ac6034d6 100644 --- a/src/main/java/com/glxp/api/entity/auth/DeptEntity.java +++ b/src/main/java/com/glxp/api/entity/auth/DeptEntity.java @@ -28,6 +28,6 @@ public class DeptEntity { private String thirdId3; private String thirdId4; - private boolean spUse; + private Boolean spUse; }