Merge remote-tracking branch 'remotes/origin/dev_ljj' into dev_temp

epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@@ -167,7 +167,7 @@ public class SsoServiceImpl implements SsoService {
         //test end
 
         if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
-            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
+            logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
             throw new RenException(EpmetErrorCode.ERR10003.getCode());
         }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -197,12 +197,13 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }catch (Exception e){
             log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
         }
-        try{
+        //项目分类打标签未上线，暂时屏蔽
+        /*try{
             //大屏项目数据抽取_按天抽取
             screenProjectSettleService.extractScreenData(param);
         }catch (Exception e){
             log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
-        }
+        }*/
         log.info("===== extractDaily method end ======");
     }