Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/SpecialSubjectServiceImpl.java

@@ -294,7 +294,7 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
 //                SpecialSubjectDTO subject = baseDao.getInfo(tagId);
 //                previewResultDTO.setSpecialSubjectId(subject.getId());
 //                previewResultDTO.setTagName(subject.getTagName());
-                previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, formDTO.getPageNo() - NumConstant.ONE,
+                previewResultDTO.setArticleList(articleService.getArticleListByTag(tagId, (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(),
                         formDTO.getPageSize()));
                 result.add(previewResultDTO);
             });
@@ -303,4 +303,4 @@ public class SpecialSubjectServiceImpl extends BaseServiceImpl<SpecialSubjectDao
 
     }
 
-}
+}

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFootBarController.java

@@ -166,11 +166,12 @@ public class CustomerFootBarController {
         List<CustomerFootBarEntity> footbars = customerFootBarService.listAllCustomerFootBars(customerId, appType);
         List<CustomerFootBarDTO> barDTOS = new LinkedList<>();
         footbars.forEach(barEntity -> {
-            CustomerFootBarEntity defaultFootBarEntity = customerFootBarService.getByAppTypeAndBarKeyOfCustomer("default", barEntity.getAppType(), barEntity.getBarKey());
-
             CustomerFootBarDTO barDTO = new CustomerFootBarDTO();
             BeanUtils.copyProperties(barEntity, barDTO);
-            barDTO.setDefaultBarName(defaultFootBarEntity.getBarName());
+            CustomerFootBarEntity defaultFootBarEntity = customerFootBarService.getByAppTypeAndBarKeyOfCustomer("default", barEntity.getAppType(), barEntity.getBarKey());
+            if(null!=defaultFootBarEntity){
+                barDTO.setDefaultBarName(defaultFootBarEntity.getBarName());
+            }
             barDTOS.add(barDTO);
         });
         return new Result<List<CustomerFootBarDTO>>().ok(barDTOS);

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

@@ -200,11 +200,13 @@ public class CustomerFootBarServiceImpl extends BaseServiceImpl<CustomerFootBarD
         }
         CustomerFootBarResultDTO dto = ConvertUtils.sourceToTarget(entity, CustomerFootBarResultDTO.class);
         CustomerFootBarEntity defaultBar = baseDao.getByAppTypeAndBarKeyOfCustomer("default", entity.getAppType(), entity.getBarKey());
-        dto.setDefaultBarName(defaultBar.getBarName());
-        dto.setDefaultIconPath(defaultBar.getIconPath());
-        dto.setDefaultSelectedIconPath(defaultBar.getSelectedIconPath());
-        dto.setDefaultPageTitle(defaultBar.getPageTitle());
-        dto.setDefaultFloatIconPath(defaultBar.getFloatIconPath());
+        if (null != defaultBar) {
+            dto.setDefaultBarName(defaultBar.getBarName());
+            dto.setDefaultIconPath(defaultBar.getIconPath());
+            dto.setDefaultSelectedIconPath(defaultBar.getSelectedIconPath());
+            dto.setDefaultPageTitle(defaultBar.getPageTitle());
+            dto.setDefaultFloatIconPath(defaultBar.getFloatIconPath());
+        }
         return dto;
     }
 
@@ -272,7 +274,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列表-->