居民管理bug修改

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -190,7 +190,7 @@ public class SysDeptController {
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
      * @Author yinzuomei
-     * @Description
+     * @Description 获取用户数据权限下各部门基本信息
      * @Date 2019/12/4 19:41
      **/
     @PostMapping("queryUserSysDeptInfo")

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -2,11 +2,14 @@ package com.elink.esua.epdc.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
@@ -21,6 +24,24 @@ import java.util.List;
  */
 @FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
 public interface AdminFeignClient {
+
+    /**
+     * @param userSysDeptInfoFormDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+     * @Author yinzuomei
+     * @Description 获取用户数据权限下各部门基本信息
+     * @Date 2019/12/6 19:40
+     **/
     @PostMapping(value = "sys/dept/queryUserSysDeptInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO);
+
+    /**
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
+     * @Author yinzuomei
+     * @Description 根据部门ID获取上级所有部门信息
+     * @Date 2019/12/6 19:49
+     **/
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
@@ -17,8 +18,28 @@ import java.util.List;
  */
 @Component
 public class AdminFeignClientFallback implements AdminFeignClient {
+	/**
+	 * @param userSysDeptInfoFormDTO
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>
+	 * @Author yinzuomei
+	 * @Description 
+	 * @Date 2019/12/6 19:50 
+	 **/
 	@Override
 	public Result<List<UserSysDeptInfoResultDTO>> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO);
 	}
+
+	/**
+	 * @param deptId
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.ParentAndAllDeptDTO>
+	 * @Author yinzuomei
+	 * @Description 根据部门ID获取上级所有部门信息
+	 * @Date 2019/12/6 19:49
+	 **/
+	@Override
+	public Result<ParentAndAllDeptDTO> getParentAndAllDept(String deptId) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
+	}
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

@@ -36,6 +36,7 @@ import com.elink.esua.epdc.dao.KpiManualScoreRuleDao;
 import com.elink.esua.epdc.dao.KpiManualScoreTempDao;
 import com.elink.esua.epdc.dao.KpiRuleDao;
 import com.elink.esua.epdc.dto.KpiManualScoreDTO;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.dto.result.ImportExcelErrorResultDTO;
@@ -327,25 +328,15 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
 		}
 		dto.setScoreStartDate(getFirstDayDateOfMonth(dto.getScoreStartMonth()));
 		dto.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth));
-		//调用admin模块查询部门信息详情
+		//根据部门ID获取上级所有部门信息
-		UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO();
+		Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(dto.getDeptId());
-		List<Long> deptIdList = new ArrayList<>();
+		if(!parentAndAllDeptDTOResult.success()){
-		deptIdList.add(Long.valueOf(dto.getDeptId()));
+			return new Result().error(parentAndAllDeptDTOResult.getMsg());
-		userSysDeptInfoFormDTO.setDeptIdList(deptIdList);
-		List<String> typeKeyList = new ArrayList<>();
-		typeKeyList.add(kpiRuleEntity.getDeptTypeKey());
-		userSysDeptInfoFormDTO.setTypeKeyList(typeKeyList);
-		Result<List<UserSysDeptInfoResultDTO>> result = this.queryUserSysDeptInfo(userSysDeptInfoFormDTO);
-		if (result.getCode() == 0 && result.getData().size() > 0) {
-			List<UserSysDeptInfoResultDTO> userSysDeptInfoResultDTOList = result.getData();
-			UserSysDeptInfoResultDTO userSysDeptInfoResultDTO = userSysDeptInfoResultDTOList.get(0);
-			dto.setParentDeptIds(userSysDeptInfoResultDTO.getPids());
-			dto.setParentDeptNames(userSysDeptInfoResultDTO.getParentNames());
-			dto.setAllDeptIds(userSysDeptInfoResultDTO.getPids() + "," + userSysDeptInfoResultDTO.getId());
-			dto.setAllDeptNames(userSysDeptInfoResultDTO.getParentNames() + "-" + userSysDeptInfoResultDTO.getName());
-		} else {
-			return new Result().error("获取部门相关信息失败");
 		}
+		dto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+		dto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+		dto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+		dto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
 		KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class);
 		baseDao.delete(getUniqueWrapper(entity));
 		insert(entity);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -28,6 +28,9 @@ import com.elink.esua.epdc.commons.tools.enums.UserSexEnum;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -35,6 +38,7 @@ import com.elink.esua.epdc.dao.PartyAuthenticationFailedDao;
 import com.elink.esua.epdc.dao.PartyMembersDao;
 import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao;
 import com.elink.esua.epdc.dao.UserDao;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO;
@@ -51,6 +55,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserStatesEnum;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.UserGridRelationService;
 import com.elink.esua.epdc.service.UserInvitationRecordService;
 import com.elink.esua.epdc.service.UserService;
@@ -81,10 +86,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
     @Autowired
     private UserInvitationRecordService userInvitationRecordService;
-
+    @Autowired
+    private UserDetailRedis userDetailRedis;
+    @Autowired
+    private AdminFeignClient adminFeignClient;
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
+        Long userId = SecurityUser.getUserId();
+        // 查询当前用户所具有的的数据权限
+        UserDetail userDetail = userDetailRedis.get(userId);
         IPage<UserDTO> iPage = this.getPage(params);
         List<UserDTO> userDtoList = this.baseDao.selectListUserDto(params);
         return new PageData<>(userDtoList, iPage.getTotal());
@@ -408,10 +419,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         userGridRel.setUserId(formUserDto.getId());
         //修改数据库结构
-        userGridRel.setAllDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity() + "-" + formUserDto.getGrid());
+//        userGridRel.setAllDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity() + "-" + formUserDto.getGrid());
-        userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
+//        userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
-        userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
+//        userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
-        userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId());
+//        userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId());
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid());
+        if(!parentAndAllDeptDTOResult.success()){
+            return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
+        }
+        userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
+        userGridRel.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds());
+        userGridRel.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+        userGridRel.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
         // 用户绑定网格
         userGridRelationService.save(userGridRel);
         // 组装用户注册信息

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -62,6 +62,7 @@
         SELECT
         u.id,
         u.REAL_NAME,
+        u.NICKNAME,
         u.MOBILE,
         u.REGISTER_TIME,
         IDENTITY_NO,
@@ -77,6 +78,7 @@
         <if test="startTime != '' and endTime != ''">and u.register_time between #{startTime} and #{endTime}</if>
         <if test="state != '' and state != null">and u.state = #{state}</if>
         <if test="realName != '' and realName != null">and u.real_name like '%${realName}%'</if>
+        <if test="nickname != '' and nickname != null">and u.NICKNAME like '%${nickname}%'</if>
         <if test="mobile != '' and mobile != null">and u.mobile like '%${mobile}%'</if>
         <if test="identityNo != '' and identityNo != null">and u.identity_no like '%${identityNo}%'</if>
         <if test="partyFlag != '' and partyFlag != null">and u.party_flag = #{partyFlag}</if>