seyason 3 år sedan
förälder
incheckning
d145a94075

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/DingDingController.java

@@ -361,10 +361,10 @@ public class DingDingController {
     }
 //
     @RequestMapping("/testCorpLeaveType")
-    public HttpRespMsg testCorpLeaveType(Integer companyId) {
+    public HttpRespMsg testCorpLeaveType(String leaveCode, Integer companyId, String userIds, long offset) {
         CompanyDingding companyDingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", companyId));
 
-        dingDingService.getLeaveTypeList(companyId);
+        dingDingService.getLeaveTypeList(leaveCode, companyId, userIds, offset);
         return new HttpRespMsg();
     }
 

+ 5 - 5
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserYearleaveSettingController.java

@@ -82,10 +82,10 @@ public class UserYearleaveSettingController {
         msg.data = userYearleaveSettingMapper.getRichList(user.getCompanyId());
         return msg;
     }
-
-    @RequestMapping("/dingdingList")
-    public HttpRespMsg getDingDingList(Integer companyId) {
-        return dingDingService.getLeaveTypeList(companyId);
-    }
+//
+//    @RequestMapping("/dingdingList")
+//    public HttpRespMsg getDingDingList(Integer companyId) {
+//        return dingDingService.getLeaveTypeList(companyId);
+//    }
 }
 

+ 7 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -1401,7 +1401,13 @@ public class DingDingServiceImpl implements DingDingService {
         }
         System.out.println(quotaListResponse.getBody());
         JSONObject json = JSONObject.parseObject(quotaListResponse.getBody());
-        return new HttpRespMsg();
+        if (json.getInteger("errcode") == 0) {
+
+        } else {
+            msg.setError(json.getString("errmsg"));
+        }
+
+        return msg;
     }
 
     public void activateSuite(String authCorpid, String tmpAuthCode) throws ApiException {