事件管理

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

@@ -61,15 +61,19 @@
 
     <select id="selectCategoryList" resultType="com.epmet.dto.IssueProjectCategoryDictDTO">
         SELECT
-            *
+            a.*,
+            b.CATEGORY_NAME as parentCategoryName
         FROM
-            issue_project_category_dict
+            issue_project_category_dict a
+        LEFT JOIN issue_project_category_dict b ON a.PID = b.ID
+        AND b.del_flag = '0'
+        AND b.customer_id = #{customerId}
         WHERE
-            del_flag = '0'
+            a.del_flag = '0'
-        AND customer_id = #{customerId}
+        AND a.customer_id = #{customerId}
         <if test="cstegoryIdList != null and cstegoryIdList.size() > 0">
             <foreach collection="cstegoryIdList" item="id" open="AND(  " separator=" OR " index="index" close=")">
-                id = #{id}
+                a.id = #{id}
             </foreach>
         </if>
         ORDER BY

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -144,7 +144,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
                 }
                 if (categoryMap.containsKey(dto.getCategoryId())) {
                     IssueProjectCategoryDictDTO category = categoryMap.get(dto.getCategoryId());
-                    dto.setCategoryName(category.getParentCategoryName().concat(StrConstant.HYPHEN).concat(category.getCategoryName()));
+                    if (StringUtils.isNotBlank(category.getParentCategoryName())) {
+                        dto.setCategoryName(category.getParentCategoryName().concat(StrConstant.HYPHEN).concat(category.getCategoryName()));
+                    } else {
+                        dto.setCategoryName(category.getCategoryName());
+                    }
                 }
                 //每个事件对应的图片数据
                 if(!CollectionUtils.isEmpty(dto.getAttachmentList())){