群组缓存bug修改

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java

@@ -34,7 +34,7 @@ public interface ResiGroupFeignClient {
      * @author wangc
      * @date 2020.05.12 13:53
      **/
-    @PostMapping("/resi/group/topictopicinfoforissuedetailgov")
+    @PostMapping("/resi/group/topic/topicinfoforissuedetailgov")
     Result<GovTopicIssueInfoResultDTO> topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO);
 
     }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -451,6 +451,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 
                 return issueInfo;
             }
+            //查询话题失败异常
         }
 
         return null;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java

@@ -18,19 +18,19 @@ public class ResiTopicTurnIssueFromDTO implements Serializable {
     /**
      * 议题名称
      * */
-    @NotBlank(message = "议题名称")
+    @NotBlank(message = "议题名称不能为空")
     private String issueTitle;
 
     /**
      * 话题Id
      * */
-    @NotBlank(message = "话题Id")
+    @NotBlank(message = "话题Id不能为空")
     private String topicId;
 
     /**
      * 建议
      * */
-    @NotBlank(message = "建议")
+    @NotBlank(message = "建议不能为空")
     private String suggestion;
 
     /**

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

@@ -134,6 +134,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		QueryWrapper<ResiGroupMemberEntity> wrapper = new QueryWrapper<>();
 		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 		wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR);
+		wrapper.eq(TopicConstant.CUSTOMER_USER_ID,params.get(TopicConstant.CUSTOMER_USER_ID));
+		wrapper.eq(TopicConstant.RESI_GROUP_ID,params.get(TopicConstant.RESI_GROUP_ID));
 		return wrapper;
 	}
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1119,7 +1119,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             }
             //5.获取网格相关信息
             ResiGroupInfoRedisDTO group = resiGroupRedis.get(topic.getGroupId());
-            if (null == group && StringUtils.isNotBlank(group.getGroupId())) {
+            if (null != group && StringUtils.isNotBlank(group.getGroupId())) {
                 CustomerGridFormDTO gridForm = new CustomerGridFormDTO();
                 gridForm.setGridId(group.getGridId());
                 Result<CustomerGridDTO> gridInfoResult = govOrgFeignClient.getCustomerGridByGridId(gridForm);