From 595aca1e571c7814383d124ad5a966eb1012d880 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 2 Sep 2020 16:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Afootbar=E7=89=A9?=
 =?UTF-8?q?=E7=90=86=E5=88=A0=E9=99=A4=20=E4=BF=AE=E6=94=B9=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0footbar=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8Cname=E5=94=AF=E4=B8=80=E6=80=A7=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/CustomerFootBarDao.java     |  6 +++
 .../impl/CustomerFootBarServiceImpl.java      |  6 +--
 .../resources/mapper/CustomerFootBarDao.xml   | 48 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
index 4c668abafe..82c2aa0b55 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java
@@ -70,10 +70,16 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
                                                           @Param("appType") String appType,
                                                           @Param("barKey") String barKey);
 
+    CustomerFootBarEntity getByAppTypeAndBarNameOfCustomer(@Param("customerId") String customerId,
+                                                          @Param("appType") String appType,
+                                                          @Param("barName") String barName);
+
     List<CustomerFootBarEntity> listByAppTypeAndCustomerId(@Param("customerId") String customerId,
                                                           @Param("appType") String appType);
 
     void updateDisplayStatus(@Param("id") String id, @Param("display") Boolean display);
 
     List<String> listFootBarOwnerCustomerIds();
+
+    void physicsDeleteById(@Param("id") String id);
 }
\ No newline at end of file
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 e664fab42c..956417476c 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
@@ -231,7 +231,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     @Override
     public void deleteFootBar(String id) {
-        baseDao.deleteById(id);
+        baseDao.physicsDeleteById(id);
     }
 
     /**
@@ -251,8 +251,8 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     private void validateBeforeUpdate(CustomerFootBarFormDTO form) {
         synchronized (this) {
-            int uniqueCount2 = baseDao.count4Unique(form.getCustomerId(), form.getAppType(), null, form.getBarName());
-            if (uniqueCount2 > 0) {
+            CustomerFootBarEntity entity = baseDao.getByAppTypeAndBarNameOfCustomer(form.getCustomerId(), form.getAppType(), form.getBarName());
+            if (entity != null && entity.getId().equals(form.getId())) {
                 throw new RenException(EpmetErrorCode.OPER_CUSTOMER_FOOTBAR_EXISTS.getCode(),
                         EpmetErrorCode.OPER_CUSTOMER_FOOTBAR_EXISTS.getMsg());
             }
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 699ffbd0a2..ba3d150a6f 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
@@ -34,6 +34,13 @@
         where ID = #{id}
     </update>
 
+    <!--物理删除-->
+    <delete id="physicsDeleteById">
+        delete
+        from customer_foot_bar
+        where ID = #{id}
+    </delete>
+
     <!--查询客户的footbar列表-->
     <select id="listDisplayCustomerFootBars" resultType="com.epmet.entity.CustomerFootBarEntity">
         SELECT
@@ -123,7 +130,22 @@
     </select>
 
     <select id="getByAppTypeAndBarKeyOfCustomer" resultType="com.epmet.entity.CustomerFootBarEntity">
-        select *
+        select id,
+               customer_id,
+               app_type,
+               bar_key,
+               bar_name,
+               page_title,
+               icon_path,
+               selected_icon_path,
+               display,
+               order_index,
+               del_flag,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
         from customer_foot_bar
         where CUSTOMER_ID = #{customerId}
           and APP_TYPE = #{appType}
@@ -150,6 +172,7 @@
         from customer_foot_bar
         where CUSTOMER_ID = #{customerId}
           and app_type = #{appType}
+          and DEL_FLAG=0
     </select>
 
     <select id="listFootBarOwnerCustomerIds" resultType="java.lang.String">
@@ -158,5 +181,28 @@
         where CUSTOMER_ID != 'default'
     </select>
 
+    <select id="getByAppTypeAndBarNameOfCustomer" resultType="com.epmet.entity.CustomerFootBarEntity">
+        select id,
+               customer_id,
+               app_type,
+               bar_key,
+               bar_name,
+               page_title,
+               icon_path,
+               selected_icon_path,
+               display,
+               order_index,
+               del_flag,
+               revision,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from customer_foot_bar
+        where CUSTOMER_ID = #{customerId}
+          and APP_TYPE = #{appType}
+          and BAR_NAME = #{barName}
+    </select>
+
 
 </mapper>
\ No newline at end of file