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] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=20=E6=9C=80=E5=A4=A7=E7=9A=84=E5=88=86=E7=B1=BB=E7=BC=96?=
 =?UTF-8?q?=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">