Просмотр исходного кода

fix: 获取部门和成员允许为空 id

wuwenyi 4 дней назад
Родитель
Сommit
8395aabf06

+ 4 - 1
src/main/java/com/qqflow/engine/domain/ewechat/api/EnterpriseWechatApi.java

@@ -84,7 +84,10 @@ public class EnterpriseWechatApi {
 
     /** 获取部门成员(仅返回本部门直属成员,不含子部门) */
     public EnterpriseWechatUserListRsp listDepartmentUsers(String accessToken, Long departmentId) {
-        String uri = "/cgi-bin/user/simplelist?access_token=" + accessToken + "&department_id=" + departmentId;
+        String uri = "/cgi-bin/user/simplelist?access_token=" + accessToken;
+        if (Objects.nonNull(departmentId)) {
+            uri += "&department_id=" + departmentId;
+        }
         return this.commonGet(uri, EnterpriseWechatUserListRsp.class);
     }
 

+ 2 - 2
src/main/java/com/qqflow/engine/domain/ewechat/controller/EnterpriseTestController.java

@@ -35,13 +35,13 @@ public class EnterpriseTestController {
     }
 
     @GetMapping("/departments")
-    public Result<EnterpriseWechatDepartmentListRsp> departments(@RequestParam(defaultValue = "0") Long id) {
+    public Result<EnterpriseWechatDepartmentListRsp> departments(@RequestParam(required = false) Long id) {
         String accessToken = wechatMsgService.getCorpAccessToken();
         return Result.ok(enterpriseWechatApi.listDepartment(accessToken, id));
     }
 
     @GetMapping("/members")
-    public Result<EnterpriseWechatUserListRsp> members(@RequestParam(defaultValue = "1") Long departmentId) {
+    public Result<EnterpriseWechatUserListRsp> members(@RequestParam(required = false) Long departmentId) {
         String accessToken = wechatMsgService.getCorpAccessToken();
         return Result.ok(enterpriseWechatApi.listDepartmentUsers(accessToken, departmentId));
     }