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

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -492,7 +492,7 @@ public class AgencyServiceImpl implements AgencyService {
             throw new RenException(staffInfoResult.getCode(),staffInfoResult.getMsg());
         }
         CustomerAgencyDTO staffAgencyDTO = agencyByStaff.getData();
-
+        log.debug("getStaffAgencyTree查询当前工作人员组织信息为:{}",JSON.toJSONString(staffAgencyDTO));
 
         //4、如果当前客户不存在子客户则areaCode置为空
         Result<List<String>> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
@@ -531,7 +531,7 @@ public class AgencyServiceImpl implements AgencyService {
                 }
                 parentAreaCode = parentAgencyDTO.getAreaCode();
             } while (true);
-            log.debug("查询所有上级为:{}",JSON.toJSONString(nodeList));
+            log.debug("getStaffAgencyTree查询所有上级为:{}",JSON.toJSONString(nodeList));
             //多客户 获取所有下级
             List<ScreenCustomerAgencyDTO> agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(null,staffAgencyDTO.getAreaCode());
             //孔村降级处理 且移除掉 党总支级别
@@ -551,7 +551,7 @@ public class AgencyServiceImpl implements AgencyService {
             }
             nodes = TreeUtils.buildTreeByAreaCode(nodeList);
         }
-        log.debug("查询所有上级树结构为:{}",JSON.toJSONString(nodes));
+        log.debug("getStaffAgencyTree查询所有上级树结构为:{}",JSON.toJSONString(nodes));
         //只有一个根节点的树 所以返回一个
         return nodes.get(0);
     }

epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml

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