Merge remote-tracking branch 'origin/master'

client_h5/src/router/index.ts

@@ -23,15 +23,11 @@ router.beforeEach((to, from, next) => {
         message: '很抱歉，用户未登录，请先重新加载！',
         confirmButtonText: '重新加载',
         beforeClose: function (action) {
-          if (action === 'confirm') {
-            closeDialog()
-            localStorage.clear()
-            getUserInfoPromise(false).then((isLoginHttp) => {
-              if (isLoginHttp) {
-                window.location.reload()
-              }
-            })
-          }
+          closeDialog()
+          localStorage.clear()
+          getUserInfoPromise(false).then((isLoginHttp) => {
+            window.location.reload()
+          })
         },
       })
     }

zjugis-module-infra/zjugis-module-infra-biz/src/main/java/com/zjugis/module/infra/service/ding/DingServiceImpl.java

@@ -122,7 +122,9 @@ public class DingServiceImpl implements DingService {
         Map map = JSONUtil.toBean(res, Map.class);
         String errorCode = map.get("errcode").toString();
         String errMsg = map.get("errmsg").toString();
-        if (!errorCode.equals("40103")) {
+        log.error(errorCode,errMsg);
+        if (!errorCode.equals("40103")&&!errorCode.equals("0")) {
+            log.error("钉钉创建员工失败！错误码：{}\n错误信息：{}", errorCode, errMsg);
             throw new ApiException(errMsg);
         }
         return errMsg;