From 775a8ab4058cb0ec20668bf14332c31c1b93f9ed Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 13:30:33 +0800
Subject: [PATCH] /gov/issue/issuecategory/categorytaglist

---
 .../com/epmet/dto/form/IssueCategoryTagListFormDTO.java    | 3 ++-
 .../java/com/epmet/controller/IssueCategoryController.java | 3 ++-
 .../src/main/java/com/epmet/dao/IssueCategoryDao.java      | 2 +-
 .../com/epmet/service/impl/IssueCategoryServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/IssueCategoryDao.xml         | 7 ++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
index d9339a0e97..3c2caa5909 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/IssueCategoryTagListFormDTO.java
@@ -15,7 +15,8 @@ public class IssueCategoryTagListFormDTO implements Serializable {
     private static final long serialVersionUID = 2599592072265715951L;
     @NotBlank(message = "议题ID不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
     private String issueId;
-
+    @NotBlank(message = "customerId不能为空",groups = {ProjectCategoryTagListFormDTO.CategoryTag.class})
+    private String customerId;
     public interface CategoryTag{}
 
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
index 6f459a71ad..6df8e177c3 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java
@@ -106,7 +106,8 @@ public class IssueCategoryController {
      * @Author sun
      **/
     @PostMapping("categorytaglist")
-    public Result<IssueCategoryTagListResultDTO> categoryTagList(@RequestBody IssueCategoryTagListFormDTO formDTO) {
+    public Result<IssueCategoryTagListResultDTO> categoryTagList(@LoginUser TokenDto tokenDto,@RequestBody IssueCategoryTagListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, IssueCategoryTagListFormDTO.CategoryTag.class);
         return new Result<IssueCategoryTagListResultDTO>().ok(issueCategoryService.categoryTagList(formDTO));
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
index 650e4ac227..42fb7ca9bf 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueCategoryDao.java
@@ -42,7 +42,7 @@ public interface IssueCategoryDao extends BaseDao<IssueCategoryEntity> {
      * @Description 查询议题绑定的分类名称，按排序升序
      * @Author sun
      **/
-    List<IssueCategoryTagResultDTO> selectIssueCategoryList(@Param("issueId") String issueId);
+    List<IssueCategoryTagResultDTO> selectIssueCategoryList(@Param("customerId")String customerId,@Param("issueId") String issueId);
 
     /**
      * @param formDTO
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
index 6953874ade..2fda58fd28 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCategoryServiceImpl.java
@@ -128,7 +128,7 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     public IssueCategoryTagListResultDTO categoryTagList(IssueCategoryTagListFormDTO formDTO) {
         IssueCategoryTagListResultDTO resultDTO = new IssueCategoryTagListResultDTO();
         //1.查询议题绑定的分类名称，按排序升序
-        List<IssueCategoryTagResultDTO> categoryList = baseDao.selectIssueCategoryList(formDTO.getIssueId());
+        List<IssueCategoryTagResultDTO> categoryList = baseDao.selectIssueCategoryList(formDTO.getCustomerId(),formDTO.getIssueId());
         if (categoryList.size() > NumConstant.ZERO) {
             resultDTO.setCategoryList(categoryList);
         }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
index 078661e2a1..4a8deef951 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml
@@ -16,7 +16,12 @@
                 a.sort AS "sort",
                 CONCAT(b.category_name, '-', a.category_name) AS "category_name"
             FROM issue_project_category_dict a
-            INNER JOIN issue_project_category_dict b ON a.pid = b.id
+            INNER JOIN issue_project_category_dict b
+                ON (a.pid = b.id
+                    and a.CUSTOMER_ID = #{customerId}
+                    and b.CUSTOMER_ID = #{customerId}
+                    and a.CUSTOMER_ID=b.CUSTOMER_ID
+                )
         ) ip ON ic.category_id = ip.idd
         AND ic.customer_id = ip.customer_id
         WHERE