Merge branch 'dev_issue_category' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java

@@ -44,7 +44,7 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Description 查询某个分类的下级分类
      * @Author sun
      **/
-    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId);
+    List<CustomerCategoryListResultDTO> subCategoryList(@Param("id") String categoryId, @Param("customerId") String customerId);
 
     /**
      * 获取默认标签配置

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

@@ -191,6 +191,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
             baseDao.deleteTagsByIssueId(form.getIssueId());
             return;
         }
+        // 不为空时走这
         List<IssueTagFormDTO> selectTags = form.getTagList();
         List<IssueTagFormDTO> newTags = issueProjectTagDictDao.selectTagId(selectTags);
         IssueTagsDTO issueTagsDTO = baseDao.selectOneTagByIssueId(form.getIssueId());

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

@@ -7,14 +7,16 @@
     <resultMap id="categoryTree" type="com.epmet.dto.result.CustomerCategoryListResultDTO">
         <id column="id" property="id"/>
         <result column="name" property="name"/>
+        <result column="customerId" property="customerId"/>
 
-        <collection property="subCategory" column="id" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
+        <collection property="subCategory" column="{id = id,customerId = customerId}" ofType="com.epmet.dto.result.CustomerCategoryListResultDTO" select="subCategoryList">
         </collection>
     </resultMap>
     <select id="selectCustomerCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_name AS "name"
+            category_name AS "name",
+            customer_id AS "customerId"
         FROM
             issue_project_category_dict
         WHERE
@@ -26,12 +28,14 @@
     <select id="subCategoryList" resultMap="categoryTree">
         SELECT
             id AS "id",
-            category_name AS "name"
+            category_name AS "name",
+            customer_id AS "customerId"
         FROM
             issue_project_category_dict
         WHERE
             del_flag = '0'
         AND pid = #{id}
+        AND customer_id = #{customerId}
         ORDER BY sort ASC
     </select>
     <!-- sql递归 查询客户议题项目的分类信息以及递归查询二级分类信息 end-->

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/CustomerCategoryListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,6 +23,11 @@ public class CustomerCategoryListResultDTO implements Serializable {
 	 * 分类名称
 	 */
 	private String name;
+	/**
+	 * 分类名称
+	 */
+	@JsonIgnore
+	private String customerId;
 
 	/**
 	 * 子级分类对象