添加员工钉钉同步userId

attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java

@@ -67,7 +67,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
                         ret.put("msg", "用户未登录或登录失效，请重新登录");
                         ServletUtils.renderString(response, JSONObject.toJSONString(ret));
                         return false;
-                    }else if(loginUser.isAdmin()||loginUser.getUserType()==1){
+                    }else if(loginUser.isAdmin()||loginUser.getUserType()==1||loginUser.getUserType()==2||loginUser.getUserType()==3){
                         return super.preHandle(request, response, handler);
                     } else {
                         ret.put("code", -1);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java

@@ -174,7 +174,6 @@ public class DeptServiceImpl extends AbstractCRUDServiceImpl<DeptDao, DeptEntity
         List<DeptEntity> returnList = list.stream().filter(t -> t.getParentId() == 0).map(
                 m -> {
                     m.setChildren(getChildren(m, list));
-
                     StaffQuery query = new StaffQuery();
                     query.setStatusNotList(Arrays.asList(StaffSatusEnum.离职.getValue()));
                     query.setDeptIdList(getChildrenId(m, list));

attendance-performance-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -28,5 +28,11 @@
 
   "portal-yibin": {
     "baseUrl": "http://112.19.80.237:11078/zwfw"
+  },
+  "qionglai": {
+    "baseUrl": "http://172.54.191.130:11039/attend"
   }
+
+
+
 }
\ No newline at end of file

attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http

@@ -4,8 +4,8 @@ POST {{baseUrl}}/login/login
 Content-Type: application/json
 
 {
-  "loginName": "admin",
-  "password": "xhxADMIN8@a",
+  "loginName": "zhangyewei",
+  "password": "123456",
   "securityCode": "admin"
 }
 
@@ -14,6 +14,34 @@ client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
 client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
+###登录
+POST {{baseUrl}}/api/v1/login/login
+Content-Type: application/json
+
+{
+  "loginName": "zhangyewei",
+  "password": "123456",
+  "code": "admin"
+}
+
+> {%
+    client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
+    client.global.set("authToken", JSON.parse(response.body).data.token);
+%}
+
+
+###登录
+POST http://10.233.82.175:11078/zwfw/login/login
+Content-Type: application/json
+
+{
+  "loginName": "xinhx",
+  "password": "xhxX123!@#",
+  "securityCode": "admin"
+}
+
+
+
 
 ###登录
 POST http://10.233.82.175:11078/zwfw/login/login