居民参加活动，接口修改

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@@ -128,21 +128,24 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     public Result<List<ResiActInfoResultDTO>> listAct(TokenDto tokenDto, ResiActBaseFormDTO formDto) {
         List<ResiActInfoResultDTO> list = new ArrayList<>();
         formDto.setUserId(tokenDto.getUserId());
-        // 查询活动状态是：报名中 signing_up
-        List<ResiActInfoResultDTO> signingUp = baseDao.selectListActSigningUp(formDto);
-        list.addAll(signingUp);
-
-        // 查询活动状态是：已报满 enough
-        List<ResiActInfoResultDTO> enough = baseDao.selectListActQuotaIsEnough(formDto);
-        list.addAll(enough);
-
-        // 查询活动状态是：截止报名 end_sign_up
-        List<ResiActInfoResultDTO> endSignUp = baseDao.selectListActEndSignUp(formDto);
-        list.addAll(endSignUp);
-
-        // 查询活动状态是：已开始 in_progress
-        List<ResiActInfoResultDTO> inProgress = baseDao.selectListActInProgress(formDto);
-        list.addAll(inProgress);
+        // 列表第一次查询，不是已结束状态的活动，一次性返回
+        if (formDto.getPageNo() == NumConstant.ONE){
+            // 查询活动状态是：报名中 signing_up
+            List<ResiActInfoResultDTO> signingUp = baseDao.selectListActSigningUp(formDto);
+            list.addAll(signingUp);
+
+            // 查询活动状态是：已报满 enough
+            List<ResiActInfoResultDTO> enough = baseDao.selectListActQuotaIsEnough(formDto);
+            list.addAll(enough);
+
+            // 查询活动状态是：截止报名 end_sign_up
+            List<ResiActInfoResultDTO> endSignUp = baseDao.selectListActEndSignUp(formDto);
+            list.addAll(endSignUp);
+
+            // 查询活动状态是：已开始 in_progress
+            List<ResiActInfoResultDTO> inProgress = baseDao.selectListActInProgress(formDto);
+            list.addAll(inProgress);
+        }
 
         // 查询活动状态是：已结束 finished
         int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

@@ -299,12 +299,17 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         boolean satisfy = false;
         // 活动不限制志愿者身份，但要求是 居民身份
         Result<List<UserRoleResultDTO>> userRoleInfo = epmetUserOpenFeignClient.getUserRoleInfoByUserId(userId);
-        if (userRoleInfo.success()){
-            for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){
-                if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){
-                    satisfy = true;
+        if (null != userRoleInfo){
+            if (userRoleInfo.success()){
+                for (UserRoleResultDTO roleResultDTO :userRoleInfo.getData()){
+                    if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(roleResultDTO.getRoleKey())){
+                        satisfy = true;
+                    }
                 }
             }
+        } else {
+            logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
+            throw new RenException(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
         }
         return satisfy;
     }

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

@@ -128,7 +128,7 @@ public class UserRoleController {
 	 * @Author zhangyong
 	 * @Date 14:24 2020-07-23
 	 **/
-	@GetMapping("getuserroleinfobyuserid/{userId}")
+	@GetMapping(value = "getuserroleinfobyuserid/{userId}")
 	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId) {
 		return userRoleService.getUserRoleInfoByUserId(userId);
 	}