Merge branches 'dev' and 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid

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;

epmet-module/gov-access/gov-access-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-access-server:
     container_name: gov-access-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.2
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-access-server:0.3.3
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.2</version>
+    <version>0.3.3</version>
     <parent>
         <artifactId>gov-access</artifactId>
         <groupId>com.epmet</groupId>

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'
     </select>
 
 

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'
     </select>
 
 

epmet-module/gov-mine/gov-mine-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.3
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.4
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.3</version>
+    <version>0.3.4</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-mine</artifactId>

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

epmet-module/gov-org/gov-org-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.10
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.12
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.10</version>
+    <version>0.3.12</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

@@ -134,6 +134,7 @@ public class DepartmentController {
      * @Author wangc
      * @Date 2020.04.26 17:09
      **/
+    @PostMapping("removestaff")
     public Result removeStaff(@LoginUser TokenDto tokenDto,@RequestBody CommonDepartmentStaffInfoFormDTO departmentStaffInfoFormDTO){
         departmentStaffInfoFormDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(departmentStaffInfoFormDTO);

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);
 	}
 }

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);
 
 }

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);

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);
 	}
 }

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<List<UnderReviewParyMemberResultDTO>> auditing(@RequestBody @Valid UnderReviewParyMemberFormDTO formDTO){
+    public Result<List<UnderReviewParyMemberResultDTO>> 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<List<ReviewedParyMemberResultDTO>> audited(@RequestBody @Valid ReviewedParyMemberFormDTO formDTO){
+    public Result<List<ReviewedParyMemberResultDTO>> audited(@RequestBody ReviewedParyMemberFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
         return partymemberBaseInfoService.audited(formDTO);
     }
 }

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
      */

epmet-user/epmet-user-server/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.8
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.9
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.8</version>
+    <version>0.3.9</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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);
     }
 }

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);
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -382,9 +382,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	public Result<List<DepartInStaffListResultDTO>> getDepartmentStaffList(DepartmentInStaffFormDTO formDTO) {
 		//1:根据userId集合查询人员基本信息
 		List<DepartInStaffListResultDTO> 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<GovStaffRoleResultDTO> staffRoleDTOS = staffRoleService.listStaffsInRole(UserRoleConstant.DEPT_LEADER, formDTO.getDepartmentId(), DataScope.getDefault());
 		staffRoleDTOS.forEach(roleDto -> {

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'
     </select>
     <select id="selectGovStaffRoleList" resultType="com.epmet.dto.GovStaffRoleDTO" parameterType="com.epmet.dto.GovStaffRoleDTO">
         select

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -34,6 +34,8 @@
         WHERE
             r.ROLE_KEY = #{roleKey}
             AND sr.ORG_ID = #{orgId}
+            AND r.DEL_FLAG = '0'
+            AND r.DEL_FLAG = '0'
     </select>