From 12cdac988c89371431cb53c64f50221643c6f0c3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 11 Dec 2020 13:52:15 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=88=86=E7=B1=BB=E5=8F=AF=E4=BB=A5=E7=A9=BF=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E7=B1=BB=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/controller/IssueCategoryController.java  | 3 ---
 .../com/epmet/service/impl/IssueCategoryServiceImpl.java    | 6 ++++++
 .../com/epmet/controller/ProjectCategoryController.java     | 3 ---
 .../com/epmet/service/impl/ProjectCategoryServiceImpl.java  | 5 +++++
 4 files changed, 11 insertions(+), 6 deletions(-)

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 2da6a153eb..bfd770a5ff 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
@@ -129,9 +129,6 @@ public class IssueCategoryController {
     @PostMapping("save")
     public Result saveCategory(@RequestBody IssueSaveCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, IssueSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
         issueCategoryService.saveCategory(formDTO);
         return new Result();
     }
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 32dcd13338..f806f28032 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
@@ -177,6 +177,12 @@ public class IssueCategoryServiceImpl extends BaseServiceImpl<IssueCategoryDao,
     @Override
     public void saveCategory(IssueSaveCategoryFormDTO formDTO) {
 
+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByIssueId(formDTO.getIssueId());
+            return;
+        }
+
         //1.查询议题所属客户和所属网格信息
         IssueEntity issue = issueService.selectById(formDTO.getIssueId());
         if (null == issue) {
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
index 2160f44778..f9c6b2acda 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java
@@ -117,9 +117,6 @@ public class ProjectCategoryController {
     @PostMapping("save")
     public Result saveCategory(@RequestBody ProjectSaveCategoryFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ProjectSaveCategoryFormDTO.SaveCategory.class);
-        if(formDTO.getCategoryList().size()< NumConstant.ONE){
-            throw new RenException("请至少选择一个分类保存");
-        }
         projectCategoryService.saveCategory(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
index 74ed9133ee..8cb2ec5a0b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectCategoryServiceImpl.java
@@ -150,6 +150,11 @@ public class ProjectCategoryServiceImpl extends BaseServiceImpl<ProjectCategoryD
     @Override
     public void saveCategory(ProjectSaveCategoryFormDTO formDTO) {
 
+        //0.如果传入的分类集合为空不管是否存在过历史分类数据，只执行一次删除操作
+        if(formDTO.getCategoryList().size()< NumConstant.ONE){
+            baseDao.delByProjectId(formDTO.getProjectId());
+            return;
+        }
         //1.查询项目所属客户和所属网格信息以及分类对应的分类信息
         Result<ProjectIssueCategoryResultDTO> result = govIssueOpenFeignClient.getProjectAndCategoryInfo(formDTO);
         if (!result.success()) {