From fd06b6f0239c6ede6b7b93914cfc6893c8849782 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 10:00:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/IssueProjectCategoryDictDao.java   |  3 ++-
 .../impl/IssueProjectCategoryDictServiceImpl.java    | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
index d85eaa3295..296e6ab41d 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -29,6 +29,7 @@ import com.epmet.project.dto.result.ProjectCategoryDictResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -155,5 +156,5 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Author zhangyong
      * @Date 14:10 2021-03-22
      **/
-    List<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+    LinkedList<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
 }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index d59598a4c1..223137d692 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -54,10 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -394,6 +391,9 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         entity.setPid(formDTO.getParentCategoryId());
         entity.setPids(formDTO.getParentCategoryId());
         IssueProjectCategoryDictDTO parentCategoryCode = baseDao.selectByCustomerId(formDTO.getCustomerId(),formDTO.getParentCategoryId());
+        if (null == parentCategoryCode) {
+            throw new RenException(String.format("获取一级分类信息失败，入参[客户id: %s, 一级分类Id: %s]",formDTO.getCustomerId(),formDTO.getParentCategoryId()));
+        }
         entity.setParentCategoryCode(parentCategoryCode.getCategoryCode());
         // 查询 当前客户下最大的一级分类数。
         Integer maxCategoryCode = baseDao.getMaxCategoryCode(formDTO.getCustomerId(), parentCategoryCode.getCategoryCode());
@@ -431,8 +431,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
 
     @Override
     public List<CustomerCategoryResultDTO> customerCategoryList(String customerId) {
-        List<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
-        List<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
+        LinkedList<CustomerCategoryResultDTO> parentCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ZERO_STR);
+        LinkedList<CustomerCategoryResultDTO> childrenCategoryDict = baseDao.selectListAllCategoryDict(customerId, NumConstant.ONE_STR);
 
         for (CustomerCategoryResultDTO p : parentCategoryDict) {
             List<CustomerCategoryResultDTO> children = new ArrayList<>();

From 9feb6da7a5c3a5d8498679f0ce56a56cd4c1c91d Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 26 Mar 2021 10:04:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8B=20=E6=9C=80=E5=A4=A7=E7=9A=84=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/IssueProjectCategoryDictDao.java    | 2 +-
 .../src/main/resources/mapper/IssueProjectCategoryDictDao.xml   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
index 296e6ab41d..a6478d987f 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectCategoryDictDao.java
@@ -117,7 +117,7 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
     int updateCustomerCategory(IsDisableCategoryFormDTO formDTO);
 
     /**
-     * 获取客户下 最大的分类编码
+     * 获取客户下 最大的分类编码(包含已被删除的编码)
      *
      * @param customerId
      * @param parentCategoryCode
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
index 385719ca7e..f9bc6b4b97 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectCategoryDictDao.xml
@@ -174,7 +174,6 @@
         WHERE
             PARENT_CATEGORY_CODE = #{parentCategoryCode}
             AND CUSTOMER_ID = #{customerId}
-            AND DEL_FLAG = '0'
     </select>
 
     <select id="isCategoryName" resultType="Integer">

From 4d13a3a9a1a88d92f07a2cab629acdccf3bab5a7 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 26 Mar 2021 10:09:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E8=AE=BE=E7=BD=AE=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/exception/EpmetErrorCode.java   |  3 ++-
 .../impl/IssueProjectCategoryDictServiceImpl.java | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index fa03a32618..94642c8a21 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -146,7 +146,8 @@ public enum EpmetErrorCode {
     TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
     TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题"),
 
-    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除");
+    CUSTOMER_CATEGORY(9101,"分类已使用，不允许删除"),
+    CATEGORY_NAME(9102,"分类名称已存在，不允许重复");
 
 	private int code;
 	private String msg;
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
index 223137d692..9dd3f3ac23 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java
@@ -253,11 +253,8 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             logger.error(String.format("修改分类信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
             throw new RuntimeException("分类信息修改失败！");
         }
-        //修改吧二级分类下默认的标签数据
-        if (issueProjectTagDictDao.updateCustomerTag(formDTO) < NumConstant.ONE) {
-            logger.error(String.format("修改标签信息状态失败，客户Id->%s,分类Id->%s", formDTO.getCustomerId(), formDTO.getCategoryId()));
-            throw new RuntimeException("分类、标签信息修改失败！");
-        }
+        //修改把二级分类下默认的标签数据
+        issueProjectTagDictDao.updateCustomerTag(formDTO);
         //4.修改缓存中标签状态
         dictRedis.updateTagAvailabilityBySecondCategoryIds(formDTO.getCustomerId(),formDTO.getSecondCategorylist(),formDTO.getType());
     }
@@ -310,7 +307,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null,null);
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的一级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = this.packageFirstCategoryDictEntity(formDTO);
         baseDao.insert(entity);
@@ -355,7 +352,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), null, formDTO.getCategoryId());
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的一级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
         entity.setCategoryName(formDTO.getCategoryName());
@@ -370,7 +367,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), null);
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的二级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = this.packageSecondCategoryDictEntity(formDTO);
         baseDao.insert(entity);
@@ -419,7 +416,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
         // 分类名称在同一个客户下同一 一级分类下有效数据中不允许重复
         Integer numCategoryName = baseDao.isCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getParentCategoryId(), formDTO.getCategoryId());
         if (NumConstant.ZERO < numCategoryName) {
-            throw new RenException("现添加的二级分类名称 重复");
+            throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
         entity.setCategoryName(formDTO.getCategoryName());