合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/User.java

 package com.zjty.tynotes.pas.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/DepartmentServiceImpl.java

 package com.zjty.tynotes.pas.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.zjty.tynotes.pas.dao.DepartmentDao;
 import com.zjty.tynotes.pas.dao.PasUserDao;
 import com.zjty.tynotes.pas.dao.RoleDao;

notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java

 package com.zjty.tynotes.pas.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
 import com.zjty.tynotes.pas.dao.*;
 import com.zjty.tynotes.pas.entity.*;
 import com.zjty.tynotes.pas.entity.vo.PageRequest;
@@ -214,7 +212,6 @@ public class UserServiceImpl implements IUserService {
                 return null;
             }
         }
-        String departmentIdList = JSON.toJSONString(user.getDepartmentIds());
         User save = pasUserDao.save(user);
         List<String> ids = new ArrayList<>();
         if(roles!=null){

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/controller/UserManageController.java

@@ -38,7 +38,7 @@ public class UserManageController {
 
     //待完成
     @ApiOperation(value = "查询人员列表", response = User.class)
-    @GetMapping("/findUserList/{id}")
+    @PostMapping("/findUserList")
     public ResponseEntity findUserList(@RequestBody PageRequest pageRequest) {
         return ok(userManageService.findUserList(pageRequest));
     }

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import java.lang.reflect.Array;
 import java.util.*;
 
 /**
@@ -64,7 +65,17 @@ public class UserManageServiceImpl implements UserManageService {
     @Override
     public PageResponse<UserVo> findUserList(PageRequest pageRequest) {
         String deId = pageRequest.getDeId();
-        Integer sort = pageRequest.getSort();
+        List<User> users = pasUserDao.findAll();
+        List<User> userList = new ArrayList<>();
+        for (User user : users) {
+            List<String> departmentIds = user.getDepartmentIds();
+            for (String departmentId : departmentIds) {
+                if(departmentId.equals(deId)){
+                    userList.add(user);
+                }
+            }
+        }
+
         return null;
 //        List<User> users = new ArrayList<>();
 //        PageResponse<UserVo> pageResponse = new PageResponse<>();
@@ -208,5 +219,4 @@ public class UserManageServiceImpl implements UserManageService {
 
 
 
-
 }