Merge branch 'dev_partymember_bug' into dev_temp

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -8,10 +8,7 @@ import com.epmet.dto.form.CreatedTimeByUserIdFormDTO;
 import com.epmet.dto.form.StaffRoleFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.result.CertifiedResultDTO;
-import com.epmet.dto.result.CreatedTimeByUserIdResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
+import com.epmet.dto.result.*;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -89,4 +86,7 @@ public interface EpmetUserFeignClient {
 	 */
 	@PostMapping("/epmetuser/staffrole/staffsinrole")
 	Result<List<GovStaffRoleResultDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO);
+
+	@PostMapping("/epmetuser/userrole/sgetresidentrole")
+	Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -565,8 +565,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
 		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
-		Result<UserResiInfoResultDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
-		if (userResiInfoResult.success() && null == userResiInfoResult.getData()) {
+		Result<UserRoleResultDTO> residentRoleResult = epmetUserFeignClient.getUserResidentRole(userResiInfoFormDTO);
+		if (!residentRoleResult.success()) {
+			throw new RenException(residentRoleResult.getCode(), residentRoleResult.getMsg());
+		}
+		if (residentRoleResult.success() && null == residentRoleResult.getData()) {
 			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
 			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());
 			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.UserRoleDTO;
+import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.excel.UserRoleExcel;
@@ -143,4 +144,9 @@ public class UserRoleController {
 	public Result<Boolean> selectIsPartyMemberByUserId(@RequestParam("userId") String userId){
 		return new Result<Boolean>().ok(userRoleService.selectIsPartyMemberByUserId(userId));
 	}
+
+	@PostMapping("getresidentrole")
+	public Result<UserRoleResultDTO> getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) {
+		return new Result<UserRoleResultDTO>().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId()));
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java

@@ -89,4 +89,14 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @date 2021/4/19 下午4:29
      */
     Integer selectIsPartyMemberByUserId(@Param("userId")String userId);
+
+    /**
+     * 获取居民权限
+     * @author zhaoqifeng
+     * @date 2021/4/22 10:44
+     * @param customerId
+     * @param userId
+     * @return java.util.List<com.epmet.dto.result.UserRoleResultDTO>
+     */
+    UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java

@@ -130,4 +130,14 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
 	 * @date 2021/4/19 下午4:34
 	 */
 	Boolean selectIsPartyMemberByUserId(String userId);
+
+	/**
+	 * 获取用户居民权限
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 10:48
+	 * @param customerId
+	 * @param userId
+	 * @return com.epmet.dto.result.UserRoleResultDTO
+	 */
+	UserRoleResultDTO getUserResidentRole(String customerId, String userId);
 }

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

@@ -154,4 +154,18 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		return false;
 	}
 
+	/**
+	 * 获取用户居民权限
+	 *
+	 * @param customerId
+	 * @param userId
+	 * @return com.epmet.dto.result.UserRoleResultDTO
+	 * @author zhaoqifeng
+	 * @date 2021/4/22 10:48
+	 */
+	@Override
+	public UserRoleResultDTO getUserResidentRole(String customerId, String userId) {
+		return baseDao.selectResidentRole(customerId, userId);
+	}
+
 }

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

@@ -111,6 +111,20 @@
           AND er.DEL_FLAG = 0
           AND er.ROLE_KEY = 'partymember'
     </select>
+    <select id="selectResidentRole" resultType="com.epmet.dto.result.UserRoleResultDTO">
+        SELECT
+            er.ROLE_NAME,
+            er.ROLE_KEY
+        FROM
+            USER_ROLE ur
+                JOIN EPMET_ROLE er ON ur.ROLE_ID = er.ID
+                AND er.ROLE_KEY = 'registered_resi'
+        WHERE
+            er.DEL_FLAG = 0
+          AND ur.DEL_FLAG = 0
+          AND ur.USER_ID = #{userId}
+          AND ur.CUSTOMER_ID = #{customerId}
+    </select>
 
     <!-- 查询此人是不是党员 -->
     <select id="selectIsPartyMemberByUserId" resultType="java.lang.Integer">