From 3b0d30b014b8c73c56f0e7a4f081958ae8468aaa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 29 Jul 2021 09:57:23 +0800
Subject: [PATCH] syncfootbar4customer

---
 .../com/epmet/service/impl/CustomerFootBarServiceImpl.java     | 3 +++
 .../src/main/resources/mapper/CustomerFootBarDao.xml           | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
index b6dda91e08..f2193531e1 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java
@@ -353,6 +353,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
     @Override
     public void createFootBarCustomer(SyncFootBar4CustomerFormDTO form) {
         if (!CollectionUtils.isEmpty(form.getSyncBarKeyList())) {
+            // 根据key， 查找产品配置中该footbar信息
             List<CustomerFootBarEntity> syncList = baseDao.selectListByKey(Constant.DEFAULT_CUSTOMER, form.getAppType(), form.getSyncBarKeyList());
             syncList.forEach(syncEntity -> {
                 baseDao.updateCustomerFootBarByKey(form.getCustomerId(),
@@ -367,6 +368,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
                 );
             });
         }
+        // 产品配置有，当前客户未上线的，直接增加
         if (!CollectionUtils.isEmpty(form.getAddBarKeyList())) {
             List<CustomerFootBarEntity> addList = baseDao.selectListByKey(Constant.DEFAULT_CUSTOMER, form.getAppType(), form.getAddBarKeyList());
             addList.forEach(addEntity -> {
@@ -375,6 +377,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
                 footBarFormDTO.setAppType(form.getAppType());
                 footBarFormDTO.setBarKey(addEntity.getBarKey());
                 footBarFormDTO.setBarName(addEntity.getBarName());
+                // 校验一下是否存在
                 validateBeforeCreate(footBarFormDTO);
 
                 CustomerFootBarEntity entity = ConvertUtils.sourceToTarget(addEntity, CustomerFootBarEntity.class);
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
index a60a9cdac0..fee4c4277b 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml
@@ -259,7 +259,6 @@
         where m.DEL_FLAG='0'
             and m.CUSTOMER_ID=#{customerId}
             and m.app_type=#{appType}
-            and m.DISPLAY='1'
             and m.BAR_KEY in
             <foreach collection="barKeyList" item="barKey" open="(  " separator=" , " index="index" close=")">
                  #{barKey}