From 3b8e986e2efbc5c55b27d0125c3d1e18eca02f71 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 28 Apr 2020 10:23:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=A6=81=E7=94=A8=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 3 ++- .../src/main/java/com/epmet/controller/StaffController.java | 4 ++-- .../src/main/java/com/epmet/service/StaffService.java | 2 +- .../main/java/com/epmet/service/impl/StaffServiceImpl.java | 5 ++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 948e607ed1..38e7eeeae5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -38,7 +38,8 @@ public enum EpmetErrorCode { NOT_ADD_GRID(8401,"您当前的网格名称已存在，请重新修改"), MOBILE_USED(8402,"该手机号已注册"), STAFF_ADD_FAILED(8403,"人员添加失败"), - STAFF_EDIT_FAILED(8404,"人员编辑失败"); + STAFF_EDIT_FAILED(8404,"人员编辑失败"), + CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),; private int code; private String msg; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 9f9109a7ba..79da9b903b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -113,7 +113,7 @@ public class StaffController { * @return Result */ @PostMapping("disabledstaff") - public Result disabledStaff(@RequestBody StaffInfoFromDTO fromDTO){ - return staffService.disabledStaff(fromDTO); + public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){ + return staffService.disabledStaff(tokenDto, fromDTO); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java index fc4a17f93d..5f36f85c12 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java @@ -80,6 +80,6 @@ public interface StaffService { * @param fromDTO 参数 * @return Result */ - Result disabledStaff(StaffInfoFromDTO fromDTO); + Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index d9d57bd34a..6db7038395 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -151,7 +151,10 @@ public class StaffServiceImpl implements StaffService { } @Override - public Result disabledStaff(StaffInfoFromDTO fromDTO) { + public Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO) { + if (tokenDto.getUserId().equals(fromDTO.getStaffId())) { + return new Result().error(EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getCode(), EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getMsg()); + } return epmetUserFeignClient.disabledStaff(fromDTO); } } From 32d8f9ee8419b6f78ae6aa71a48da16c3dabb2e2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 28 Apr 2020 10:24:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=B8=8B=E4=BA=BA=E5=91=98=E8=A7=92=E8=89=B2=E6=94=B9=E7=94=A8?= =?UTF-8?q?=E7=BB=84=E7=BB=87Id,=E4=B8=8D=E8=83=BD=E7=94=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DepartmentServiceImpl.java | 1 + .../java/com/epmet/dto/form/DepartmentInStaffFormDTO.java | 5 +++++ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 15cde80e98..07dcc028ee 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -168,6 +168,7 @@ public class DepartmentServiceImpl implements DepartmentService { } DepartmentInStaffFormDTO departmentInStaffFormDTO = new DepartmentInStaffFormDTO(); //部门Id用于查询部门领导角色使用 + departmentInStaffFormDTO.setAgencyId(entity.getAgencyId()); departmentInStaffFormDTO.setDepartmentId(formDTO.getDepartmentId()); departmentInStaffFormDTO.setCustomerId(entity.getCustomerId()); departmentInStaffFormDTO.setUserIdList(userIdList); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java index 5810659515..bad1e30b62 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DepartmentInStaffFormDTO.java @@ -14,6 +14,11 @@ public class DepartmentInStaffFormDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 组织Id + */ + private String agencyId; + /** * 部门Id */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index c7049bfaf8..7b7603b823 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -382,9 +382,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> getDepartmentStaffList(DepartmentInStaffFormDTO formDTO) { //1:根据userId集合查询人员基本信息 List staffList = baseDao.selectDepartmentStaffList(formDTO); - //2:根据部门Id查询部门下是领导角色的用户 + //2:根据组织Id查询部门下是领导角色的用户 StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); - staffRoleFormDTO.setOrgId(formDTO.getDepartmentId()); + staffRoleFormDTO.setOrgId(formDTO.getAgencyId()); staffRoleFormDTO.setRoleKey(UserRoleConstant.DEPT_LEADER); List staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId(), DataScope.getDefault()); staffRoleDTOS.forEach(roleDto -> { From 9bbc18a1091fddbb42257101676ffcb4794ee31d Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 28 Apr 2020 10:27:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=83=A8?= =?UTF-8?q?=E5=88=86sql=E8=AF=AD=E5=8F=A5=E6=B2=A1=E6=9C=89=E5=8A=A0del=5F?= =?UTF-8?q?flag=3D0=E7=9A=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/OperationScopeDao.xml | 2 ++ .../src/main/resources/mapper/RoleOperationDao.xml | 2 ++ .../src/main/resources/mapper/GovStaffRoleDao.xml | 1 + .../src/main/resources/mapper/StaffRoleDao.xml | 2 ++ 4 files changed, 7 insertions(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml index ab6839e941..8b07df685d 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml @@ -23,6 +23,8 @@ on (rs.SCOPE_KEY = os.SCOPE_KEY) where rs.ROLE_ID = #{roleId} and rs.OPERATION_KEY = #{operationKey} + and rs.DEL_FLAG = '0' + and os.DEL_FLAG = '0' diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml index 0845fc5202..ebde0d7c2c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleOperationDao.xml @@ -27,6 +27,8 @@ INNER JOIN operation o ON ( ro.OPERATION_KEY = o.OPERATION_KEY ) WHERE ro.ROLE_ID = #{roleId} + and ro.DEL_FLAG = '0' + and o.DEL_FLAG = '0' diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml index e5c4449733..d3de570592 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml @@ -28,6 +28,7 @@ sr.STAFF_ID = #{staffId} AND sr.ORG_ID = #{orgId} AND sr.DEL_FLAG = '0' + AND r.DEL_FLAG = '0' From 7e3b2b5e71244bbcfe4d6c9436ede8beb8387ca1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 28 Apr 2020 10:39:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/StaffAgencyController.java | 4 +++- .../controller/PartymemberBaseInfoController.java | 6 ++++-- .../com/epmet/controller/StaffGridVisitedController.java | 3 ++- .../java/com/epmet/controller/UserInvitationController.java | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java index 67ace77271..3c77f93e23 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java @@ -77,10 +77,12 @@ public class StaffAgencyController { * @Date 2020/4/23 10:34 **/ @PostMapping("switchgrid") - public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody @Valid SwitchGridFormDTO switchGridFormDTO) { + public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody SwitchGridFormDTO switchGridFormDTO) { switchGridFormDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(switchGridFormDTO); return staffAgencyService.switchGrid(switchGridFormDTO); } + /** * @Description 得到工作人员最后一次登录的网格 * @Param TokenDto -> userId/staffId diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java index ac20a61f89..438594f0b3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberBaseInfoController.java @@ -104,7 +104,8 @@ public class PartymemberBaseInfoController { * @Date 2020/4/26 20:35 **/ @PostMapping("auditing") - public Result> auditing(@RequestBody @Valid UnderReviewParyMemberFormDTO formDTO){ + public Result> auditing(@RequestBody UnderReviewParyMemberFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); return partymemberBaseInfoService.auditing(formDTO); } @@ -116,7 +117,8 @@ public class PartymemberBaseInfoController { * @Date 2020/4/26 23:40 **/ @PostMapping("audited") - public Result> audited(@RequestBody @Valid ReviewedParyMemberFormDTO formDTO){ + public Result> audited(@RequestBody ReviewedParyMemberFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); return partymemberBaseInfoService.audited(formDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java index 2e8dc01c3f..c79e3439b2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java @@ -67,7 +67,8 @@ public class StaffGridVisitedController { * @Date 2020/4/23 11:19 **/ @PostMapping("savestaffgridvisitedrecord") - public Result saveStaffGridVisitedRecord(@RequestBody @Valid StaffGridVisitedFormDTO staffGridVisitedFormDTO) { + public Result saveStaffGridVisitedRecord(@RequestBody StaffGridVisitedFormDTO staffGridVisitedFormDTO) { + ValidatorUtils.validateEntity(staffGridVisitedFormDTO); return staffGridVisitedService.saveStaffGridVisitedRecord(staffGridVisitedFormDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java index 6832021461..fc268ac8dd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserInvitationController.java @@ -101,7 +101,8 @@ public class UserInvitationController { * @Date 2020/4/10 0:28 **/ @PostMapping("saveuserinvitation") - public Result saveUserInvitation(@RequestBody @Valid UserInvitationFormDTO formDTO) { + public Result saveUserInvitation(@RequestBody UserInvitationFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); return userInvitationService.saveUserInvitation(formDTO); } }