From 7484ca70cb4b50690864fac561628bd8ed1ee510 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 15:38:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=20if=EF=BC=8Celse=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=A7=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResiTopicServiceImpl.java    | 60 ++++++++++++++-----
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index fcf366c789..f5d4db2f50 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -482,10 +482,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                                 Collections.EMPTY_LIST :
                                                 badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList())
                                 );
-                            } else top.setBadgeList(Collections.EMPTY_LIST);
+                            } else {
+                                top.setBadgeList(Collections.EMPTY_LIST);
+                            }
                         });
 
-                    } else latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    } else {
+                        latestTenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    }
 
                 }
             }
@@ -555,10 +559,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                             Collections.EMPTY_LIST :
                                             badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList())
                             );
-                        }else top.setBadgeList(Collections.EMPTY_LIST);
+                        }else {
+                            top.setBadgeList(Collections.EMPTY_LIST);
+                        }
                     });
 
-                }else pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                }else {
+                    pastTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                }
 
             }
 
@@ -887,8 +895,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if(null == groupEntity || StringUtils.isBlank(groupEntity.getCustomerId())){
                 log.error("com.epmet.modules.topic.service.impl.ResiTopicServiceImpl.getTopicDetail，获取不到组信息，话题Id：{}小组Id：{}",topicId,topicDetail.getGroupId());
                 throw new RenException(ModuleConstant.NO_SUCH_GROUP);
-            }else customerId = groupEntity.getCustomerId();
-        }else customerId = groupCache.getCustomerId();
+            }else {
+                customerId = groupEntity.getCustomerId();
+            }
+        }else {
+            customerId = groupCache.getCustomerId();
+        }
 
         Result<Map<String, List<UserBadgeUnitFormDTO>>> badgeR
                 = userOpenFeignClient.userShowBadge(new UserGroupFormDTO(customerId, userId));
@@ -965,10 +977,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                                                 Collections.EMPTY_LIST :
                                                 badgeM.get(top.getUserId()).stream().map(UserBadgeUnitFormDTO::getBadgeIcon).collect(Collectors.toList())
                                 );
-                            } else top.setBadgeList(Collections.EMPTY_LIST);
+                            } else {
+                                top.setBadgeList(Collections.EMPTY_LIST);
+                            }
                         });
 
-                    } else hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    } else {
+                        hiddenTopics.forEach(top -> top.setBadgeList(Collections.EMPTY_LIST));
+                    }
 
                 }
             }
@@ -1803,7 +1819,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
             }
 
-        }else throw new RenException(dataFilterResult.getMsg());
+        }else {
+            throw new RenException(dataFilterResult.getMsg());
+        }
 
         return result;
 
@@ -1820,12 +1838,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
     public IssueShiftedFromTopicFormDTO getIssueInfoWhenAudit(ResiTopicTurnIssueFromDTO param) {
 
         ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(param.getTopicId());
-        if (null == group) throw new RenException(ModuleConstant.QUERY_GROUPINFO_FAILED);
+        if (null == group) {
+            throw new RenException(ModuleConstant.QUERY_GROUPINFO_FAILED);
+        }
 
         ResiTopicEntity topic = resiTopicDao.selectById(param.getTopicId());
-        if (null == topic) throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
+        if (null == topic) {
+            throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
+        }
 
-        if (topic.getShiftIssue()) throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        if (topic.getShiftIssue()) {
+            throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
+        }
 
         IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(param, IssueShiftedFromTopicFormDTO.class);
 
@@ -1871,7 +1895,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             if (operationResult != NumConstant.ONE) {
                 logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
             }
-        } else logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+        } else {
+            logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+        }
         //7.更新组统计信息 议题数量+1
         resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
         if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
@@ -2053,7 +2079,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                         Optional.ofNullable(param.getPageSize()).orElse(NumConstant.ONE)).doSelectPageInfo(() ->
                 baseDao.selectParticipatedTopics(param.getCustomerId(),param.getUserId()));
         List<ParticipatedTopicUnitResultDTO> result = page.getList();
-        if(CollectionUtils.isEmpty(result)) return Collections.EMPTY_LIST;
+        if(CollectionUtils.isEmpty(result)) {
+            return Collections.EMPTY_LIST;
+        }
         Result<List<OrgInfoResultDTO>> gridR = govOrgOpenFeignClient.selectOrgInfo(
                 new OrgInfoFormDTO(OrgInfoConstant.GRID,result.stream().map(ParticipatedTopicUnitResultDTO :: getTopicReleaseGridName).distinct().collect(Collectors.toList())));
         if(gridR.success() && !CollectionUtils.isEmpty(gridR.getData())){
@@ -2120,7 +2148,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                 List<IssueApplicationDTO> applications = reply.getData();
 
                 return StringUtils.equals(ModuleConstant.TOPIC_SHIFTED_TO_ISSUE_STATUS_UNDER_AUDITING,applications.get(NumConstant.ZERO).getApplyStatus()) ? true : false;
-            }else return false;
+            }else {
+                return false;
+            }
         }
         log.error("Method [checkTopicIfUnderAuditing] of service gov-issue called failed,topicId is [%s]",topicId);
         throw new RenException(reply.getInternalMsg());