新增反参

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

@@ -643,6 +643,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
     public GovIssueDetailResultDTO issueDetailGov(IssueDetailFormDTO issueParam) {
         //1.得到议题信息
         IssueEntity issueDetail = selectById(issueParam.getIssueId());
+        GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDetail.getGridId());
+        if(null == gridInfo){
+            throw new EpmetException("查询网格信息失败"+issueDetail.getGridId());
+        }
         GovIssueDetailResultDTO issueInfo = new GovIssueDetailResultDTO();
         //2.1如果此条议题来源自话题
         if(StringUtils.equals(ModuleConstants.ISSUE_FROM_TOPIC,issueDetail.getSourceType())){
@@ -672,10 +676,6 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             //查询话题失败异常
         }else if (ModuleConstants.ISSUE.equals(issueDetail.getSourceType())){
             issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class);
-            GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(issueDetail.getGridId());
-            if(null == gridInfo){
-                throw new EpmetException("查询网格信息失败"+issueDetail.getGridId());
-            }
             Result<List<UserBaseInfoResultDTO>> userResult = userOpenFeignClient.queryUserBaseInfo(Arrays.asList(issueDetail.getCreatedBy()));
             if (!userResult.success() || CollectionUtils.isEmpty(userResult.getData())){
                 throw new EpmetException("查询居民信息失败");
@@ -685,6 +685,16 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             issueInfo.setIssuePublisherMobile(user.getMobile());
             issueInfo.setBelongsGridName(gridInfo.getGridNamePath());
             return issueInfo;
+        }else {
+            issueInfo = ConvertUtils.sourceToTarget(issueDetail,GovIssueDetailResultDTO.class);
+            CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(issueDetail.getCustomerId(), issueDetail.getCreatedBy());
+            if (null == staffInfo){
+                throw new EpmetException("查询工作人员信息失败："+issueDetail.getCreatedBy());
+            }
+            issueInfo.setIssueInitiator(staffInfo.getRealName());
+            issueInfo.setIssuePublisherMobile(staffInfo.getMobile());
+            issueInfo.setBelongsGridName(gridInfo.getGridNamePath());
+            return issueInfo;
         }
 
         return null;