Merge remote-tracking branch 'origin/dev_ui_upgrade' into develop

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

@@ -83,7 +83,7 @@ public interface CustomerFootBarDao extends BaseDao<CustomerFootBarEntity> {
 
     void physicsDeleteById(@Param("id") String id);
 
-    void physicsDeleteByAppTypeAndBarKey(@Param("appType") String appType, @Param("barKey") String barKey);
+    void physicsDeleteByAppTypeAndBarKey(@Param("appType") String appType, @Param("barKey") String barKey,@Param("id")String id);
 
     /**
      * 客户定制化-FootBar配置，获取当前客户未上线的

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

@@ -272,7 +272,7 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
     public void deleteFootBar(String id) {
         CustomerFootBarEntity defaultFootbar = baseDao.selectById(id);
         // 注释07.28
-        // baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey());
+        baseDao.physicsDeleteByAppTypeAndBarKey(defaultFootbar.getAppType(), defaultFootbar.getBarKey(),id);
 
         // 删除缓存中的footbar。若缓存删除失败，则事务回滚，db中的不应该成功
         redisUtils.delete(RedisKeys.getCustomerFootbarKey(defaultFootbar.getCustomerId(), defaultFootbar.getAppType()));

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

@@ -46,6 +46,7 @@
         from customer_foot_bar
         where app_type = #{appType}
           and BAR_KEY = #{barKey}
+          and id=#{id}
     </delete>
 
     <!--查询客户的footbar列表-->