1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -226,7 +226,7 @@ public class UserWithBeisenController {
         }
         //todo 获取到指定日期的考勤数据
         //todo 获取到指定日期的加班数据
-        Optional<UserWithBeisen> withBeisen = userWithBeisenList.stream().filter(u -> u.getUserId().equals(user.getId())).findFirst();
+        Optional<UserWithBeisen> withBeisen = userWithBeisenList.stream().filter(u ->u.getJobNumber()!=null&& u.getJobNumber().equals(user.getJobNumber())).findFirst();
         if(!withBeisen.isPresent()){
             msg.setError("当前员工在北森系统中不存在,请完成录入员工信息");
             return msg;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/BeiSenUtils.java

@@ -271,15 +271,10 @@ public class BeiSenUtils {
         System.out.println("--------requestMap请求参数-------"+requestMap);
         HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
         ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
-        if (ResponseEntity.getStatusCode() == HttpStatus.OK) {
-            String resp= ResponseEntity.getBody();
-            JSONObject respJson = JSONObject.parseObject(resp);
-            if(respJson.getIntValue("Code")==200){
-                JSONObject data = respJson.getJSONObject("data");
-                return data;
-            }
-        }
-        return new JSONObject();
+        String resp= ResponseEntity.getBody();
+        JSONObject respJson = JSONObject.parseObject(resp);
+        JSONObject data = respJson.getJSONObject("data");
+        return data;
     }
 
 
@@ -305,16 +300,10 @@ public class BeiSenUtils {
         System.out.println("--------requestMap请求参数-------"+requestMap);
         HttpEntity<JSONObject> entity = new HttpEntity<>(requestMap, headers);
         ResponseEntity<String> ResponseEntity = restTemplate.postForEntity(url, entity, String.class);
-        JSONArray lastJSONArray=new JSONArray();
-        if (ResponseEntity.getStatusCode() == HttpStatus.OK) {
-            String resp= ResponseEntity.getBody();
-            JSONObject respJson = JSONObject.parseObject(resp);
-            if(respJson.getIntValue("Code")==200){
-                JSONArray data = respJson.getJSONArray("data");
-                return data;
-            }
-        }
-        return new JSONArray();
+        String resp= ResponseEntity.getBody();
+        JSONObject respJson = JSONObject.parseObject(resp);
+        JSONArray data = respJson.getJSONArray("data");
+        return data;
     }
 
 }