|
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 考评部门配置
|
|
* 考评部门配置
|
|
@@ -125,20 +124,17 @@ public class DepartmentAllocationController {
|
|
@GetMapping(value = "/getDepartmentLeader/{id}")
|
|
@GetMapping(value = "/getDepartmentLeader/{id}")
|
|
public R getDepartmentLeader(@PathVariable String id) {
|
|
public R getDepartmentLeader(@PathVariable String id) {
|
|
List<PostUserDTO> list = new ArrayList<>();
|
|
List<PostUserDTO> list = new ArrayList<>();
|
|
- Object postList = postService.getPostList(1, 500, "23031005", request);
|
|
|
|
|
|
+ Object postList = postService.getPostList(1, 500, id, request);
|
|
if (null != postList) {
|
|
if (null != postList) {
|
|
JSONObject postJsonArr = (JSONObject) postList;
|
|
JSONObject postJsonArr = (JSONObject) postList;
|
|
-// JSONObject postDataJsonArr = (JSONObject) postJsonArr.get("data");
|
|
|
|
JSONArray postArray = JSONUtil.parseArray(postJsonArr.get("records"));
|
|
JSONArray postArray = JSONUtil.parseArray(postJsonArr.get("records"));
|
|
List<PostDTO> postArrList = JSONUtil.toList(postArray, PostDTO.class);
|
|
List<PostDTO> postArrList = JSONUtil.toList(postArray, PostDTO.class);
|
|
- List<PostDTO> postDeptList = postArrList.stream().filter(item -> item.getDeptId().equals(id)).collect(Collectors.toList());
|
|
|
|
- for (PostDTO post : postDeptList) {
|
|
|
|
|
|
+ for (PostDTO post : postArrList) {
|
|
if (post.getName().contains("主任")) {
|
|
if (post.getName().contains("主任")) {
|
|
Object postPersonnelList = postUserService.getPostUserList(1, 500, post.getId(), request);
|
|
Object postPersonnelList = postUserService.getPostUserList(1, 500, post.getId(), request);
|
|
if (null != postPersonnelList) {
|
|
if (null != postPersonnelList) {
|
|
JSONObject postPersonnelJsonArr = (JSONObject) postPersonnelList;
|
|
JSONObject postPersonnelJsonArr = (JSONObject) postPersonnelList;
|
|
- JSONObject postPersonnelDataJsonArr = (JSONObject) postPersonnelJsonArr.get("data");
|
|
|
|
- JSONArray postPersonnelArray = JSONUtil.parseArray(postPersonnelDataJsonArr.get("records"));
|
|
|
|
|
|
+ JSONArray postPersonnelArray = JSONUtil.parseArray(postPersonnelJsonArr.get("records"));
|
|
List<PostUserDTO> userArrList = JSONUtil.toList(postPersonnelArray, PostUserDTO.class);
|
|
List<PostUserDTO> userArrList = JSONUtil.toList(postPersonnelArray, PostUserDTO.class);
|
|
if (userArrList.size() > 0) {
|
|
if (userArrList.size() > 0) {
|
|
list.addAll(userArrList);
|
|
list.addAll(userArrList);
|