Merge branch 'master' of https://gitea.anxinyun.cn/gao.zhiyuan/HumanResource

api/app/lib/schedule/attendance.js

@@ -11,7 +11,7 @@ module.exports = function (app, opts) {
          proRun: true,
       },
       async () => {
-         console.info('假勤数据更新 ', moment().format('YYYY-MM-DD HH:mm:ss'));
+         console.log('假勤数据更新 ', moment().format('YYYY-MM-DD HH:mm:ss'));
          const { workFlow: { processState } } = opts
          try {
             const startTime = moment()
@@ -565,10 +565,10 @@ module.exports = function (app, opts) {
                }
             }
 
-            console.info(`
+            console.log(`
                假勤数据更新 用时 ${moment().diff(startTime, 'seconds')} s
             `)
-            console.info(`
+            console.log(`
                共：${attendanceRes.length};
                新增：${insertCount};
                更新数据：${updateCount};

api/app/lib/service/clickHouseClient.js

@@ -11,7 +11,7 @@ function factory (app, opts) {
                app.fs.clickHouse[d.name] = new ClickHouse({
                   url: url,
                   port: port,
-                  debug: true || opts.dev,
+                  debug: opts.dev,
                   format: "json",
                   basicAuth: user && password ? {
                      username: user,

api/app/lib/utils/member.js

@@ -379,6 +379,7 @@ module.exports = function (app, opts) {
                obj[nextKey] = u[k] == '1970-01-01 00:00:00.000000' ? null : u[k]
             }
             pepUserIds.push(u.pepUserId)
+            console.log("查询到的用户信息：", obj);
             returnD.push({
                ...obj,
                departmrnt: u.depId ? [{