Merge remote-tracking branch 'origin/develop' into release_temp

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

@@ -1687,8 +1687,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         Iterator<ResiBuzzLeftPieChartResultDTO> list = pieChat.iterator();
         while (list.hasNext()){
             ResiBuzzLeftPieChartResultDTO next = list.next();
-            for (ResiBuzzLeftPieChartResultDTO category : categories) {
-                if (next.getIssueId().equals(category.getIssueId())){
+            for (int i = 0; i < categories.size(); i++) {
+                if (next.getIssueId().equals(categories.get(i).getIssueId()) && !next.getStatus()){
+                    next.setStatus(true);
                     list.remove();
                     continue;
                 }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@@ -729,6 +729,7 @@
             from (select #{c.issueId} as issueId,#{c.categoryCode} as categoryCode) t1
             LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.CUSTOMER_ID = #{customerId} AND cd.DEL_FLAG = '0' )
         </foreach>)t2
+        group by t2.categoryName
     </select>
 
     <resultMap id="selectCategoryNameByIssueListMap" type="com.epmet.dto.result.ResiBuzzIssueCategoryDTO">