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

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java

@@ -17,6 +17,7 @@
 
 package com.epmet.redis;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
@@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 
@@ -46,7 +48,7 @@ public class GovCustomerMenuRedis {
      * @see com.epmet.enums.MenuTypeEnum
      */
     public void setCustomerMenuList(String customerId, Integer type, List<GovMenuDTO> govMenuDTOS) {
-        if (checkParam(customerId, type)) {
+        if (checkParam(customerId, type) && !CollectionUtils.isEmpty(govMenuDTOS) && StringUtils.isNotBlank(govMenuDTOS.get(NumConstant.ZERO).getName())) {
             String key = RedisKeys.getCustomerMenuList(customerId, type);
             redisUtils.set(key, govMenuDTOS, RedisUtils.DEFAULT_EXPIRE);
         }

epmet-openapi/epmet-openapi-scan/src/main/resources/logback-spring.xml

@@ -142,9 +142,8 @@
     <springProfile name="dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="INFO"/>
         <logger name="com.epmet.dao" level="DEBUG"/>
-        <root level="INFO">
+        <root level="DEBUG">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>
             <appender-ref ref="WARN_FILE"/>