Merge branch 'dsc' into 'develop'

员工bug,配置输出信息info

See merge request 8timerv2/8timerapiv200!13

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -152,7 +152,8 @@ public class YgglController {
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("org_code", orgCode).eq("emp_num", empNum);
 		queryWrapper.eq("org_code", orgCode).eq("emp_num", empNum);
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
-		if (ygglMainEmp != null) {
+		Date rz = ygglMainEmp.getRzTime();
+		if (rz != null) {
 			ygglMainEmp.setWorkTime(DateUtil.formatBetween(ygglMainEmp.getRzTime(), new Date(),Level.DAY));
 			ygglMainEmp.setWorkTime(DateUtil.formatBetween(ygglMainEmp.getRzTime(), new Date(),Level.DAY));
 		}
 		}
 		return ResultUtil.data(ygglMainEmp, "获取员工档案成功");
 		return ResultUtil.data(ygglMainEmp, "获取员工档案成功");

src/main/resources/application-pro.yml

@@ -116,7 +116,7 @@ pagehelper:
 #showSql
 #showSql
 logging:
 logging:
   level:
   level:
-    root: DEBUG
+    root: info
     cn.timer.api.dao: error
     cn.timer.api.dao: error
   pattern:
   pattern:
     console: '--%p--%m%n'
     console: '--%p--%m%n'