修改异常抛出

epmet-auth/src/main/java/com/epmet/controller/GovLoginController.java

@@ -40,7 +40,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/loginbywxcode")
     public Result<UserTokenResultDTO> loginByWxCode(@RequestBody GovWxmpFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.loginByWxCode(formDTO);
+        UserTokenResultDTO userTokenResultDTO=govLoginService.loginByWxCode(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
     /**
@@ -53,7 +54,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/sendsmscode")
     public Result sendSmsCode(@RequestBody SendSmsCodeFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.sendSmsCode(formDTO);
+        govLoginService.sendSmsCode(formDTO);
+        return new Result();
     }
 
     /**
@@ -66,7 +68,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/getmyorg")
     public Result<List<StaffOrgsResultDTO>> getmyorg(@RequestBody StaffOrgsFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.getMyOrg(formDTO);
+        List<StaffOrgsResultDTO> staffOrgs=govLoginService.getMyOrg(formDTO);
+        return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }
 
     /**
@@ -79,7 +82,8 @@ public class GovLoginController {
     @PostMapping(value = "/loginwxmp/enterorg")
     public Result<UserTokenResultDTO> enterOrg(@RequestBody GovWxmpEnteOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return govLoginService.enterOrg(formDTO);
+        UserTokenResultDTO userTokenResultDTO=govLoginService.enterOrg(formDTO);
+        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
     }
 
     /**
@@ -91,7 +95,8 @@ public class GovLoginController {
      **/
     @PostMapping("/loginwxmp/loginout")
     public Result loginOut(@LoginUser TokenDto tokenDto) {
-        return govLoginService.loginOut(tokenDto);
+        govLoginService.loginOut(tokenDto);
+        return new Result();
     }
 }
 

epmet-auth/src/main/java/com/epmet/service/GovLoginService.java

@@ -24,7 +24,7 @@ public interface GovLoginService {
      * @Description 政府端微信小程序登录-发送验证码
      * @Date 2020/4/18 10:59
      **/
-    Result sendSmsCode(SendSmsCodeFormDTO formDTO);
+    void sendSmsCode(SendSmsCodeFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -33,7 +33,7 @@ public interface GovLoginService {
      * @Description 3、手机验证码获取组织
      * @Date 2020/4/18 21:11
      **/
-    Result<List<StaffOrgsResultDTO>> getMyOrg(StaffOrgsFormDTO formDTO);
+    List<StaffOrgsResultDTO> getMyOrg(StaffOrgsFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -42,7 +42,7 @@ public interface GovLoginService {
      * @Description 政府端小程序根据wxCode获取上一次登录信息，返回token
      * @Date 2020/4/20 11:23
      **/
-    Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO);
+    UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO);
 
     /**
      * @param formDTO
@@ -51,7 +51,7 @@ public interface GovLoginService {
      * @Description 4、选择组织，进入首页
      * @Date 2020/4/20 13:08
      **/
-    Result<UserTokenResultDTO> enterOrg(GovWxmpEnteOrgFormDTO formDTO);
+    UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
@@ -60,5 +60,5 @@ public interface GovLoginService {
      * @Description 政府端工作人员退出登录
      * @Date 2020/4/21 22:08
      **/
-    Result loginOut(TokenDto tokenDto);
+    void loginOut(TokenDto tokenDto);
 }

epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.epmet.common.token.constant.LoginConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -67,28 +68,27 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Date 2020/4/18 10:59
      **/
     @Override
-    public Result sendSmsCode(SendSmsCodeFormDTO formDTO) {
+    public void sendSmsCode(SendSmsCodeFormDTO formDTO) {
         //1、校验手机号是否符合规范
         if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg()));
-            return new Result().error(EpmetErrorCode.ERROR_PHONE.getCode());
+            throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode());
         }
         //2、根据手机号校验用户是否存在
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile());
         if (!customerStaffResult.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
-            return new Result().error(customerStaffResult.getCode());
+            throw new RenException(customerStaffResult.getCode());
         }
         //3、发送短信验证码
         Result<Map<String, String>> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile());
         if (!smsCodeResult.success()) {
             logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg()));
-            return new Result().error(smsCodeResult.getCode());
+            throw new RenException(smsCodeResult.getCode());
         }
         //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis)
         captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code"));
         logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile()));
-        return new Result();
     }
 
     /**
@@ -99,18 +99,18 @@ public class GovLoginServiceImpl implements GovLoginService {
      * @Date 2020/4/18 21:11
      **/
     @Override
-    public Result<List<StaffOrgsResultDTO>> getMyOrg(StaffOrgsFormDTO formDTO) {
+    public List<StaffOrgsResultDTO> getMyOrg(StaffOrgsFormDTO formDTO) {
         //1、根据手机号查询到用户信息
         Result<List<CustomerStaffDTO>> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile());
         if (!customerStaffResult.success()) {
             logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg()));
-            return new Result().error(customerStaffResult.getCode());
+            throw new RenException(customerStaffResult.getCode());
         }
         //2、验证码是否正确
         String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile());
         if (!formDTO.getSmsCode().equals(rightSmsCode)) {
             logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()));
-            return new Result<List<StaffOrgsResultDTO>>().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+            throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
         }
         //3、查询用户所有的组织信息
         List<String> customerIdList = new ArrayList<>();
@@ -120,11 +120,15 @@ public class GovLoginServiceImpl implements GovLoginService {
         StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO();
         staffOrgFormDTO.setCustomerIdList(customerIdList);
         Result<List<StaffOrgsResultDTO>> result = govOrgFeignClient.getStaffOrgList(staffOrgFormDTO);
-        return result;
+        if(result.success()&&null!=result.getData()){
+           return result.getData();
+        }
+        logger.error(String .format("手机验证码获取组织,调用%s服务失败,入参手机号%s,验证码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER,formDTO.getMobile(),formDTO.getSmsCode(),result.getCode(),result.getMsg()));
+        return new ArrayList<>();
     }
 
     @Override
-    public Result<UserTokenResultDTO> loginByWxCode(GovWxmpFormDTO formDTO) {
+    public UserTokenResultDTO loginByWxCode(GovWxmpFormDTO formDTO) {
         //1、解析微信用户
         WxMaJscode2SessionResult wxMaJscode2SessionResult = loginService.getWxMaUser(formDTO.getApp(), formDTO.getWxCode());
         if(null!=wxMaJscode2SessionResult){
@@ -133,7 +137,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         Result<StaffLatestAgencyResultDTO> latestStaffWechat = epmetUserFeignClient.getLatestStaffWechatLoginRecord(wxMaJscode2SessionResult.getOpenid());
         if (!latestStaffWechat.success() || null == latestStaffWechat.getData()) {
             logger.error(String.format("没有获取到用户最近一次登录账户信息,code[%s],msg[%s]", EpmetErrorCode.PLEASE_LOGIN.getCode(), EpmetErrorCode.PLEASE_LOGIN.getMsg()));
-            return new Result<UserTokenResultDTO>().error(EpmetErrorCode.PLEASE_LOGIN.getCode());
+            throw new RenException(EpmetErrorCode.PLEASE_LOGIN.getCode());
         }
         StaffLatestAgencyResultDTO staffLatestAgencyResultDTO = latestStaffWechat.getData();
         //2、记录staff_wechat
@@ -146,7 +150,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         this.saveLatestGovTokenDto(staffLatestAgencyResultDTO, wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
-        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+        return userTokenResultDTO;
     }
 
     //保存tokenDto到redis
@@ -244,7 +248,7 @@ public class GovLoginServiceImpl implements GovLoginService {
     }
 
     @Override
-    public Result<UserTokenResultDTO> enterOrg(GovWxmpEnteOrgFormDTO formDTO) {
+    public UserTokenResultDTO enterOrg(GovWxmpEnteOrgFormDTO formDTO) {
         //1、需要校验要登录的客户，是否被禁用
         CustomerStaffFormDTO customerStaffFormDTO = new CustomerStaffFormDTO();
         customerStaffFormDTO.setCustomerId(formDTO.getCustomerId());
@@ -252,7 +256,7 @@ public class GovLoginServiceImpl implements GovLoginService {
         Result<CustomerStaffDTO> customerStaffDTOResult = epmetUserFeignClient.getCustomerStaffInfo(customerStaffFormDTO);
         if (!customerStaffDTOResult.success() || null == customerStaffDTOResult.getData()) {
             logger.error(String.format("获取工作人员信息失败,手机号[%s],客户id:[%s],code[%s],msg[%s]", formDTO.getMobile(), formDTO.getCustomerId(), customerStaffDTOResult.getCode(), customerStaffDTOResult.getMsg()));
-            return new Result().error(customerStaffDTOResult.getCode());
+            throw new RenException(customerStaffDTOResult.getCode());
         }
         CustomerStaffDTO customerStaff = customerStaffDTOResult.getData();
         //2、解析微信用户
@@ -267,17 +271,16 @@ public class GovLoginServiceImpl implements GovLoginService {
         this.saveGovTokenDto(formDTO.getRootAgencyId(), formDTO.getCustomerId(), customerStaff.getUserId(), wxMaJscode2SessionResult, token);
         UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
         userTokenResultDTO.setToken(token);
-        return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
+        return userTokenResultDTO;
     }
 
     @Override
-    public Result loginOut(TokenDto tokenDto) {
+    public void loginOut(TokenDto tokenDto) {
         if(null == tokenDto){
             logger.error("token解析失败,直接跳转重新登录即可");
             throw new RenException("当前用户信息获取失败");
         }
         cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());
-        return new Result();
     }
 
     //保存登录日志

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiPartyMemberController.java

@@ -51,7 +51,9 @@ public class ResiPartyMemberController {
     @PostMapping("auditing")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITINGLIST)
     public Result<List<AuditingPartyMemberResultDTO>> auditing(@RequestBody AuditingPartyMemberFormDTO formDTO) {
-        return resiPartyMemberService.auditing(formDTO);
+        ValidatorUtils.validateEntity(formDTO);
+        List<AuditingPartyMemberResultDTO> list=resiPartyMemberService.auditing(formDTO);
+        return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
     }
 
     /**
@@ -64,7 +66,9 @@ public class ResiPartyMemberController {
     @PostMapping("audited")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTYAUTH_AUDITHISTORY)
     public Result<List<AuditedPartyMemberResultDTO>> audited(@RequestBody AuditedPartyMemberFormDTO formDTO) {
-        return resiPartyMemberService.audited(formDTO);
+        ValidatorUtils.validateEntity(formDTO);
+        List<AuditedPartyMemberResultDTO> list=resiPartyMemberService.audited(formDTO);
+        return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
     }
 
     /**

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java

@@ -37,7 +37,7 @@ public interface ResiPartyMemberService {
      * @Description 待审核列表
      * @Date 2020/4/26 16:04
      **/
-    Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO);
+    List<AuditingPartyMemberResultDTO> auditing(AuditingPartyMemberFormDTO formDTO);
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.AuditedPartyMemberResultDTO>>
      * @param formDTO
@@ -45,7 +45,7 @@ public interface ResiPartyMemberService {
      * @Description  党员认证-审核历史列表（审核历史：只包括自动审核失败和拒绝的审核失败：居民未填写补充信息。）
      * @Date 2020/4/26 23:32
      **/
-    Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
+    List<AuditedPartyMemberResultDTO> audited(AuditedPartyMemberFormDTO formDTO);
 
     /**
      *

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiPartyMemberServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -39,37 +40,37 @@ public class ResiPartyMemberServiceImpl implements ResiPartyMemberService {
     private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
     @Override
-    public Result<List<AuditingPartyMemberResultDTO>> auditing(AuditingPartyMemberFormDTO formDTO) {
+    public List<AuditingPartyMemberResultDTO> auditing(AuditingPartyMemberFormDTO formDTO) {
-        UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
         List<AuditingPartyMemberResultDTO> list = new ArrayList<>();
+        UnderReviewParyMemberFormDTO underReviewParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, UnderReviewParyMemberFormDTO.class);
         Result<List<UnderReviewParyMemberResultDTO>> result = resiPartymemberFeignClient.auditingPartyMember(underReviewParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            logger.error(String.format("调用%s服务查询单元认证-待审核列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
+            logger.info(String.format("调用%s服务查询党员认证-待审核列表,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
-            return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+            return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditingPartyMemberResultDTO.class);
-        return new Result<List<AuditingPartyMemberResultDTO>>().ok(list);
+        return list;
     }
 
     @Override
-    public Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO) {
+    public List<AuditedPartyMemberResultDTO> audited(AuditedPartyMemberFormDTO formDTO) {
-        ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
         List<AuditedPartyMemberResultDTO> list = new ArrayList<>();
+        ReviewedParyMemberFormDTO reviewedParyMemberFormDTO = ConvertUtils.sourceToTarget(formDTO, ReviewedParyMemberFormDTO.class);
         Result<List<ReviewedParyMemberResultDTO>> result = resiPartymemberFeignClient.auditedPartyMember(reviewedParyMemberFormDTO);
         if (!result.success()) {
-            logger.error(String.format("调用resi-partymember-server模块失败,错误提示%s", result.getMsg()));
+            logger.error(String.format("调用%s服务查询党员认证-审核历史列表失败,入参网格id[%s],错误码%s,错误提示%s", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId(), result.getCode(), result.getMsg()));
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
         if (null == result.getData() || result.getData().isEmpty()) {
-            logger.info(String.format("网格id[%s],待审核党员列表查询为空", formDTO.getGridId()));
+            logger.info(String.format("调用%s服务查询党员认证-审核历史列表为空,入参网格id[%s],待审核党员列表查询为空", ServiceConstant.RESI_PARTYMEMBER_SERVER, formDTO.getGridId()));
-            return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
+            return list;
         }
         list = ConvertUtils.sourceToTarget(result.getData(), AuditedPartyMemberResultDTO.class);
-        return new Result<List<AuditedPartyMemberResultDTO>>().ok(list);
+        return list;
     }
 
     /**

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java

@@ -82,7 +82,8 @@ public class StaffAgencyController {
 	public Result switchGrid(@LoginUser TokenDto tokenDto, @RequestBody SwitchGridFormDTO switchGridFormDTO) {
 		switchGridFormDTO.setStaffId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(switchGridFormDTO);
-		return staffAgencyService.switchGrid(switchGridFormDTO);
+		staffAgencyService.switchGrid(switchGridFormDTO);
+		return new Result();
 	}
 
 	/**

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java

@@ -57,7 +57,7 @@ public interface StaffAgencyService {
      * @Description 切换网格
      * @Date 2020/4/23 10:49
      **/
-    Result switchGrid(SwitchGridFormDTO switchGridFormDTO);
+    void switchGrid(SwitchGridFormDTO switchGridFormDTO);
 
     /**
      * @Description 得到工作人员最后一次登录的网格

epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@@ -220,7 +220,7 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
 
 
     @Override
-    public Result switchGrid(SwitchGridFormDTO switchGridFormDTO) {
+    public void switchGrid(SwitchGridFormDTO switchGridFormDTO) {
         //记录网格访问记录
         StaffGridVisitedFormDTO staffGridVisitedFormDTO = ConvertUtils.sourceToTarget(switchGridFormDTO, StaffGridVisitedFormDTO.class);
         Result saveStaffGridVisitedRecord = epmetUserFeignClient.saveStaffGridVisitedRecord(staffGridVisitedFormDTO);
@@ -230,7 +230,6 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
        /* //查询网格的权限
         Set<String> opeKeys = accessService.listOpeKeysByStaffId(switchGridFormDTO.getStaffId(), null, switchGridFormDTO.getGridId());
         return new Result<Set<String>>().ok(opeKeys);*/
-        return new Result();
     }
 
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ApplyingMemberFormDTO.java

@@ -25,4 +25,10 @@ public class ApplyingMemberFormDTO implements Serializable {
 	private Integer pageNo;
 
 	private Integer pageSize=20;
+
+	/**
+	 * 从token中获取的用户ID
+	 */
+	@NotBlank(message = "用户id不能为空")
+	private String userId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/GroupMemberListFormDTO.java

@@ -26,4 +26,9 @@ public class GroupMemberListFormDTO implements Serializable {
 
 	private Integer pageSize=20;
 
+	/**
+	 * 从token中获取的用户ID
+	 */
+	@NotBlank(message = "用户id不能为空")
+	private String userId;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java

@@ -60,7 +60,8 @@ public class GroupInvitationController {
                                                                         @RequestBody CreateGroupInvitationFormDTO formDTO) {
 		formDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(formDTO);
-		return groupInvitationService.createGroupInvitation(formDTO);
+		CreateGroupInvitationResultDTO createGroupInvitationResultDTO=groupInvitationService.createGroupInvitation(formDTO);
+		return new Result<CreateGroupInvitationResultDTO>().ok(createGroupInvitationResultDTO);
 	}
 
 	/**
@@ -75,7 +76,8 @@ public class GroupInvitationController {
                                                            @RequestBody LinkGroupInfoFormDTO formDTO) {
 		formDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(formDTO);
-		return groupInvitationService.getLinkGroupInfo(formDTO);
+		LinkGroupInfoResultDTO linkGroupInfoResultDTO=groupInvitationService.getLinkGroupInfo(formDTO);
+		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
 	}
 
     /**
@@ -92,6 +94,7 @@ public class GroupInvitationController {
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setApp(tokenDto.getApp());
         ValidatorUtils.validateEntity(formDTO);
-        return groupInvitationService.accetInvitation(formDTO);
+		groupInvitationService.accetInvitation(formDTO);
+        return new Result();
     }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java

@@ -106,7 +106,7 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 生成邀请连接
      * @Date 2020/3/31 22:50
      **/
-	Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
+	CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
 
 	/**
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
@@ -115,7 +115,7 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
 	 * @Description 根据群邀请连接查询群基本信息
 	 * @Date 2020/3/31 23:20
 	 **/
-    Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
+    LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
@@ -124,5 +124,5 @@ public interface GroupInvitationService extends BaseService<GroupInvitationEntit
      * @Description 同意邀请进组
      * @Date 2020/3/31 23:47
      **/
-	Result accetInvitation(AccetInvitationFormDTO formDTO);
+	void accetInvitation(AccetInvitationFormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -20,10 +20,7 @@ package com.epmet.modules.invitation.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.constant.*;
-import com.epmet.commons.tools.constant.Constant;
-import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -160,7 +157,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 22:50
 	 **/
 	@Override
-	public Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
+	public CreateGroupInvitationResultDTO createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
 		//1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮）
 		//2、审核通过（讨论中）的群才可以分享邀请连接
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
@@ -181,7 +178,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		insert(groupInvitationEntity);
 		CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
 		resultDTO.setInvitationId(groupInvitationEntity.getId());
-		return new Result<CreateGroupInvitationResultDTO>().ok(resultDTO);
+		return resultDTO;
 	}
 
 	/**
@@ -192,13 +189,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 23:20
 	 **/
 	@Override
-	public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
+	public LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
 		//0、校验是否存在该邀请连接（判断是会否被删除连接、是否失效、群状态）
-		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
+		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
-		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
-		}
-		GroupInvitationDTO groupInvitationDTO=validResult.getData();
 		LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO();
 		//1、查询是否在群内
 		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
@@ -214,12 +207,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupInfo.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
-			logger.info("组长注册信息查询失败" + groupLeaderUserInfo.getMsg());
+			logger.error(String.format("居民端用户【%s】根据链接【%s】查看群邀请信息调用%s服务,获取组长信息异常,错误码:%s,错误提示:%s",formDTO.getUserId(),formDTO.getInvitationId(), ServiceConstant.EPMET_USER_SERVER,groupLeaderUserInfo.getCode(), groupLeaderUserInfo.getMsg()));
 		}
 		linkGroupInfoResultDTO.setGroupInfo(groupInfo);
 		//4、记录用户邀请关系
 		this.saveUserInvitation(groupInvitationDTO,formDTO);
-		return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
+		return linkGroupInfoResultDTO;
 	}
 
 	/**
@@ -240,9 +233,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userInvitationFormDTO.setInviteSourceId(formDTO.getInvitationId());
 		Result result = epmetUserFeignClient.saveUserInvitation(userInvitationFormDTO);
 		if (!result.success()) {
-			logger.info("人员邀请关系记录失败" + result.getMsg());
+			logger.error("人员邀请关系记录失败" + result.getMsg());
 		} else {
-			logger.info("人员邀请关系记录成功");
+			logger.error("人员邀请关系记录成功");
 		}
 		return result;
 	}
@@ -270,17 +263,19 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		return epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 	}
 
-	private Result<GroupInvitationDTO> checkLinkValid(String invitationId) {
+	private GroupInvitationDTO checkLinkValid(String invitationId) {
 		//校验是否存在该邀请连接
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
 		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
 		if (null == groupInvitationDTO) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
+			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
 		if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
+			logger.error(String.format("根据链接【%s】查看群邀请信息异常,错误码:%s,错误提示:%s",invitationId,EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()));
+			throw new RenException(EpmetErrorCode.LOSE_EFFICACY.getCode());
 		}
-		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
+		/*ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
 		if (null == resiGroupEntity) {
 			logger.info("组不存在");
 			//TODO
@@ -290,8 +285,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		} else if (null != resiGroupEntity && GroupStateConstant.GROUP_HIDDEN.equals(resiGroupEntity.getState())) {
 			logger.info("组已屏蔽");
 			//TODO
-		}
+		}*/
-		return new Result<GroupInvitationDTO>().ok(groupInvitationDTO);
+		return groupInvitationDTO;
 	}
 
 	/**
@@ -302,13 +297,9 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @Date 2020/3/31 23:47
 	 **/
 	@Override
-	public Result accetInvitation(AccetInvitationFormDTO formDTO) {
+	public void accetInvitation(AccetInvitationFormDTO formDTO) {
 		//1、申请是否有效
-		Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
+		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
-		if (!validResult.success()) {
-			return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(), validResult.getMsg());
-		}
-		GroupInvitationDTO groupInvitationDTO=validResult.getData();
 		//2、校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(groupInvitationDTO.getResiGroupId());
 		UserRoleDTO userRoleDTO=new UserRoleDTO();
@@ -319,7 +310,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 					resiGroupDTO.getCustomerId(),
 					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				logger.error(String.format("居民端用户【%s】同意邀请进组失败,错误码:%s,错误提示:%s",formDTO.getUserId(),EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 			}
 		}
 		//3、新增一条邀请入群、直接审核通过的入群记录
@@ -348,7 +340,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
 		//6、发送消息
 		this.sendMessageToLeader(formDTO, resiGroupDTO,groupInvitationDTO);
-		return new Result();
 	}
 
 	/**
@@ -384,7 +375,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {
-			logger.info("通知群主有新成员入群失败" + result.getMsg());
+			logger.error("通知群主有新成员入群失败" + result.getMsg());
 		}
 		return result;
 	}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java

@@ -60,7 +60,8 @@ public class ResiGroupMemberController {
 		applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
 		applyJoinGroupFormDTO.setApp(tokenDto.getApp());
 		ValidatorUtils.validateEntity(applyJoinGroupFormDTO);
-		return resiGroupMemberService.applyJoinGroup(applyJoinGroupFormDTO);
+		resiGroupMemberService.applyJoinGroup(applyJoinGroupFormDTO);
+		return new Result();
 	}
 
 	/**
@@ -74,8 +75,10 @@ public class ResiGroupMemberController {
 	@PostMapping("getgroupmember")
 	public Result<List<GroupMemberListResultDTO>> getGroupMemberList(@LoginUser TokenDto tokenDto,
                                                                      @RequestBody GroupMemberListFormDTO groupMemberListFormDTO) {
+		groupMemberListFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(groupMemberListFormDTO);
-		return resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO);
+		List<GroupMemberListResultDTO> list=resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO);
+		return new Result<List<GroupMemberListResultDTO>>().ok(list);
 	}
 
 	/**
@@ -89,8 +92,10 @@ public class ResiGroupMemberController {
 	@PostMapping("getapplyingmember")
 	public Result<List<ApplyingMemberResultDTO>> getApplyingMember(@LoginUser TokenDto tokenDto,
 																   @RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) {
+		applyingMemberFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(applyingMemberFormDTO);
-		return resiGroupMemberService.getApplyingMember(applyingMemberFormDTO);
+		List<ApplyingMemberResultDTO> list = resiGroupMemberService.getApplyingMember(applyingMemberFormDTO);
+		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
 	}
 
 	/**
@@ -107,7 +112,8 @@ public class ResiGroupMemberController {
 		agreeApplyFormDTO.setUserId(tokenDto.getUserId());
 		agreeApplyFormDTO.setApp(tokenDto.getApp());
 		ValidatorUtils.validateEntity(agreeApplyFormDTO);
-		return resiGroupMemberService.agreeApply(agreeApplyFormDTO);
+		resiGroupMemberService.agreeApply(agreeApplyFormDTO);
+		return new Result();
 	}
 
 	/**
@@ -123,7 +129,8 @@ public class ResiGroupMemberController {
                                 @RequestBody DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		disagreeApplyFormDTO.setUserId(tokenDto.getUserId());
 		ValidatorUtils.validateEntity(disagreeApplyFormDTO);
-		return resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO);
+		resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO);
+		return new Result();
 	}
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java

@@ -114,16 +114,16 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 申请加入小组
      * @Date 2020/3/29 20:01
      **/
-    Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO);
+     void applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @param groupMemberListFormDTO
      * @Author yinzuomei
-     * @Description
+     * @Description 群成员列表
      * @Date 2020/3/30 21:15
      **/
-    Result<List<GroupMemberListResultDTO>> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO);
+    List<GroupMemberListResultDTO> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO);
 
     /**
      * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO>>
@@ -132,7 +132,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 查看入群待审核列表
      * @Date 2020/3/30 21:38
      **/
-	Result<List<ApplyingMemberResultDTO>> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO);
+	List<ApplyingMemberResultDTO> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO);
 
     /**
      * @param agreeApplyFormDTO
@@ -141,7 +141,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 组长同意入群
      * @Date 2020/3/30 22:07
      **/
-    Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO);
+    void agreeApply(AgreeApplyFormDTO agreeApplyFormDTO);
 
     /**
      * @param disagreeApplyFormDTO
@@ -150,7 +150,7 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Description 组长拒绝入群
      * @Date 2020/3/30 22:07
      **/
-    Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO);
+    void disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO);
 
     /**
      * @param resiGroupMemberDTO

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -192,7 +193,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/29 20:01
 	 **/
 	@Override
-	public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
+	public void applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
 		//校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(applyJoinGroupFormDTO.getGroupId());
 		if (null != resiGroupDTO) {
@@ -201,17 +202,18 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					resiGroupDTO.getCustomerId(),
 					resiGroupDTO.getGridId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
+				logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,%s", applyJoinGroupFormDTO.getUserId(), applyJoinGroupFormDTO.getGroupId(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()));
+				throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 			}
 		}
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			logger.error(ModuleConstant.ALREADY_APPLIED_GROUP);
+			logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_APPLIED_GROUP));
 			throw new RenException(ModuleConstant.ALREADY_APPLIED_GROUP);
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
-			logger.error(ModuleConstant.ALREADY_IN_GROUP);
+			logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_IN_GROUP));
 			throw new RenException(ModuleConstant.ALREADY_IN_GROUP);
 		}
 		//插入一条待审核的记录
@@ -225,18 +227,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperation.setOperateUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
-		return new Result();
 	}
 
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 * @Author yinzuomei
-	 * @Description
+	 * @Description 群成员列表
 	 * @Date 2020/3/30 21:15
 	 **/
 	@Override
-	public Result<List<GroupMemberListResultDTO>> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) {
+	public List<GroupMemberListResultDTO> getGroupMemberList(GroupMemberListFormDTO groupMemberListFormDTO) {
 		int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize();
 		groupMemberListFormDTO.setPageNo(pageIndex);
 		List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
@@ -258,9 +259,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 						}
 					}
 				}
+			}else{
+				logger.error(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", groupMemberListFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
 			}
 		}
-		return new Result<List<GroupMemberListResultDTO>>().ok(list);
+		return list;
 	}
 
 	/**
@@ -271,7 +274,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 21:38
 	 **/
 	@Override
-	public Result<List<ApplyingMemberResultDTO>> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) {
+	public List<ApplyingMemberResultDTO> getApplyingMember(ApplyingMemberFormDTO applyingMemberFormDTO) {
 		int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize();
 		applyingMemberFormDTO.setPageNo(pageIndex);
 		List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
@@ -293,10 +296,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 						}
 					}
 				}
+			}else{
+				logger.error(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
 			}
 
 		}
-		return new Result<List<ApplyingMemberResultDTO>>().ok(list);
+		return list;
 	}
 
 	/**
@@ -307,17 +312,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 22:07
 	 **/
 	@Override
-	public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
+	public void agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
 		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
-			logger.error(ModuleConstant.APPLY_NOEXISTS);
+			logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS));
 			throw new RenException(ModuleConstant.APPLY_NOEXISTS);
 		}
 		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
-			logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
+			logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
 			throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
 		//3、修改操作状态
@@ -371,7 +376,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			}
 			resiGroupRedis.set(groupCache);
 		}
-		return new Result();
 	}
 
 	/**
@@ -405,17 +409,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 * @Date 2020/3/30 22:07
 	 **/
 	@Override
-	public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
+	public void disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
 		//1、当前申请单是否是待审核
 		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
-			logger.error(ModuleConstant.APPLY_NOEXISTS);
+			logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS));
 			throw new RenException(ModuleConstant.APPLY_NOEXISTS);
 		}
 		//2、只有群主才可以审批入群申请
 		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
 		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
-			logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
+			logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
 			throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
 		}
 		//3、修改操作状态
@@ -426,7 +430,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//4、给用户发送消息
 		this.sendUserRejectedMessage(groupMemeberOperationDTO,disagreeApplyFormDTO);
-		return new Result();
 	}
 
 	@Override

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@@ -34,7 +34,8 @@ public class ResiMineGridController {
 	 **/
 	@GetMapping("getlatestgridinfo")
 	public Result<LatestGridInfoResultDTO> getLatestGridInfo(@LoginUser TokenDto tokenDto){
-		return resiMineGridService.getLatestGridInfo(tokenDto);
+		LatestGridInfoResultDTO latestGridInfoResultDTO=resiMineGridService.getLatestGridInfo(tokenDto);
+		return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);
 	}
 
 	/**

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java

@@ -20,7 +20,7 @@ public interface ResiMineGridService {
 	 * @param tokenDto
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.mine.dto.result.LatestGridInfoResultDTO>
 	 */
-	Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto);
+	LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto);
 
 	/**
 	 * @return

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.modules.grid.service.impl;
 
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -41,16 +42,22 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 	 * @Date 2020/3/24 11:11
 	 **/
 	@Override
-	public Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto) {
+	public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) {
+		LatestGridInfoResultDTO latestGridInfoResultDTO=new LatestGridInfoResultDTO();
 		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
-			logger.error(ModuleConstant.USER_NOT_NULL);
+			logger.error(String.format("居民端【%s】获取用户最近访问的网格失败:错误提示:%s",tokenDto.getUserId(),ModuleConstant.USER_NOT_NULL));
 			throw new RenException(ModuleConstant.USER_NOT_NULL);
 		}
 		if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
-			logger.error(ModuleConstant.FOR_RESI_CALL);
+			logger.error(String.format("居民端【%s】获取用户最近访问的网格失败,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL));
 			throw new RenException(ModuleConstant.FOR_RESI_CALL);
 		}
-		return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+		Result<LatestGridInfoResultDTO> userResult=epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
+		if(userResult.success()&&null!=userResult.getData()){
+			return userResult.getData();
+		}
+		logger.error(String.format("居民端用户【%s】获取用户最近访问网格失败,调用%s服务入参userId:%s,错误码:%s,错误提示:%s", tokenDto.getUserId(),ServiceConstant.EPMET_USER_SERVER,tokenDto.getUserId(),userResult.getCode(),userResult.getMsg()));
+		return latestGridInfoResultDTO;
 	}
 
 	/**