From 171fbb06bb16060566f466458b3eef72ed666b8a Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 31 Mar 2021 11:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=85=8D=E7=BD=AE=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E6=89=80=E6=9C=89=E5=AE=A2=E6=88=B7=E9=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E9=85=8D=E7=BD=AE=E8=BF=99=E4=B8=AA=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java    | 2 +-
 .../com/epmet/service/impl/GovCustomerMenuServiceImpl.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
index 1bd4fc67bc..e6c8ca205c 100644
--- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
+++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
@@ -21,7 +21,7 @@ public class MenuConfigFormDTO implements Serializable {
 
     /**
      * 客户id 列表
+     *  列表为空，则所有客户都不配置这个菜单了。
      */
-    @NotBlank(message = "客户id 列表不能为空")
     private List<String> customerIds;
 }
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
index 32cf57e0c7..8d7ef26acc 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java
@@ -106,9 +106,8 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
 
     @Override
     public void saveCustomerMenu(MenuConfigFormDTO formDTO) {
+        baseDao.deleteBatchTableIds(formDTO.getTableId());
         if (NumConstant.ZERO < formDTO.getCustomerIds().size()) {
-            baseDao.deleteBatchTableIds(formDTO.getTableId());
-
             List<GovCustomerMenuEntity> entities = new ArrayList<>();
             for (String customerId : formDTO.getCustomerIds()) {
                 GovCustomerMenuEntity entity = new GovCustomerMenuEntity();