Merge branch 'dev_footbar' into dev_temp

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFootBarDao.java

@@ -82,4 +82,6 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
     List<String> listFootBarOwnerCustomerIds();
 
     void physicsDeleteById(@Param("id") String id);
+
+    void physicsDeleteByAppTypeAndBarKey(@Param("appType") String appType, @Param("barKey") String barKey);
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFootBarServiceImpl.java

@@ -232,7 +232,8 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
 
     @Override
     public void deleteFootBar(String id) {
-        baseDao.physicsDeleteById(id);
+        CustomerFootBarEntity defaultFootbar = baseDao.selectById(id);
+        baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey());
     }
 
     /**

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFootBarDao.xml

@@ -41,6 +41,13 @@
         where ID = #{id}
     </delete>
 
+    <delete id="physicsDeleteByAppTypeAndBarKey">
+        delete
+        from customer_foot_bar
+        where app_type = #{appType}
+          and BAR_KEY = #{barKey}
+    </delete>
+
     <!--查询客户的footbar列表-->
     <select id="listDisplayCustomerFootBars" resultType="com.epmet.entity.CustomerFootBarEntity">
         SELECT