From c589a9d00e00b39ab92181263a6a88d77f45e5e5 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 30 Mar 2021 10:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=A1=B9=E7=9B=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=AD=97=E5=85=B8=E8=A1=A8=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?id+customerId=E8=81=94=E5=90=88=E4=B8=BB=E9=94=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/IssueProjectCategoryDictDao.java      | 10 ++++++
 .../IssueProjectCategoryDictServiceImpl.java  |  6 ++--
 .../mapper/IssueProjectCategoryDictDao.xml    | 33 +++++++++++++++++++
 3 files changed, 47 insertions(+), 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 a6478d987f..ff49f564b1 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
@@ -157,4 +157,14 @@ public interface IssueProjectCategoryDictDao extends BaseDao<IssueProjectCategor
      * @Date 14:10 2021-03-22
      **/
     LinkedList<CustomerCategoryResultDTO> selectListAllCategoryDict(@Param("customerId") String customerId, @Param("pid") String pid);
+
+    /**
+     * 根据 主键+customerId 修改议题项目分类字典
+     *
+     * @param entity
+     * @return int
+     * @Author zhangyong
+     * @Date 09:53 2021-03-30
+     **/
+    int updateIssueProjectCategoryDict(IssueProjectCategoryDictEntity entity);
 }
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 9dd3f3ac23..62d39412c3 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
@@ -355,10 +355,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
         entity.setCategoryName(formDTO.getCategoryName());
         entity.setSort(formDTO.getSort());
         entity.setId(formDTO.getCategoryId());
-        baseDao.updateById(entity);
+        baseDao.updateIssueProjectCategoryDict(entity);
         return new Result<>();
     }
 
@@ -419,10 +420,11 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             throw new RenException(EpmetErrorCode.CATEGORY_NAME.getCode(), EpmetErrorCode.CATEGORY_NAME.getMsg());
         }
         IssueProjectCategoryDictEntity entity = new IssueProjectCategoryDictEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
         entity.setCategoryName(formDTO.getCategoryName());
         entity.setSort(formDTO.getSort());
         entity.setId(formDTO.getCategoryId());
-        baseDao.updateById(entity);
+        baseDao.updateIssueProjectCategoryDict(entity);
         return new Result<>();
     }
 
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 f9bc6b4b97..3a29df5f14 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
@@ -212,4 +212,37 @@
         </if>
         ORDER BY SORT, CATEGORY_CODE ASC
     </select>
+
+    <update id="updateIssueProjectCategoryDict">
+        UPDATE issue_project_category_dict
+        SET
+        <if test='pid != "" and pid != null'>
+            PID = #{pid},
+        </if>
+        <if test='pids != "" and pids != null'>
+            PIDS = #{pids},
+        </if>
+        <if test='parentCategoryCode != "" and parentCategoryCode != null'>
+            PARENT_CATEGORY_CODE = #{parentCategoryCode},
+        </if>
+        <if test='categoryCode != "" and categoryCode != null'>
+            CATEGORY_CODE = #{categoryCode},
+        </if>
+        <if test='categoryName != "" and categoryName != null'>
+            CATEGORY_NAME = #{categoryName},
+        </if>
+        <if test='categoryType != "" and categoryType != null'>
+            CATEGORY_TYPE = #{categoryType},
+        </if>
+
+        <if test='sort != "" and sort != null'>
+            SORT = #{sort},
+        </if>
+        <if test='isDisable != "" and isDisable != null'>
+            IS_DISABLE = #{isDisable},
+        </if>
+        UPDATED_TIME = NOW()
+        WHERE
+        customer_id = #{customerId} AND id = #{id} AND DEL_FLAG = '0'
+    </update>
 </mapper>