diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java index 35f4079a6..ea04f64ad 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/controller/ActivityPartyController.java @@ -65,7 +65,7 @@ public class ActivityPartyController { return new Result().ok(data); } - @PostMapping("save") + @PostMapping public Result save(@RequestBody ActivityPartyDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java index 050ec13bd..712d81f4d 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java @@ -112,9 +112,7 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl parentResult = null; - if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) { - entity.setDeptId(String.valueOf(dto.getDeptId())); - parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); + if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { + entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); } else { parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } @@ -152,9 +150,6 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl parentResult = null; - if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) { - entity.setDeptId(String.valueOf(dto.getDeptId())); - parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); + if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) { + entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); + parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]); } else { parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId())); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java index 900847051..8779ec17c 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java @@ -83,11 +83,13 @@ public class FlowPartyServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.like(StringUtils.isNotBlank(name), FieldConstant.NAME_HUMP, name); wrapper.like(StringUtils.isNotBlank(idCard), FieldConstant.ID_CARD, idCard); wrapper.like(StringUtils.isNotBlank(mobile), FieldConstant.MOBILE_HUMP, mobile); + wrapper.eq(StringUtils.isNotBlank(status), "STATUS", status); return wrapper; }