From 5df556121638f4d551d8d56a268c5fc2e87522f6 Mon Sep 17 00:00:00 2001
From: tianea <tianxyy80@gmail.com>
Date: Tue, 30 Aug 2022 20:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tz/platform/user/pc/PcUserInfoController.java    | 3 ++-
 .../java/com/tz/platform/user/pc/biz/PcUserInfoBiz.java  | 9 ++++++++-
 .../com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java     | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java
index a3877d4..2df396a 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/PcUserInfoController.java
@@ -22,7 +22,8 @@ public class PcUserInfoController extends BaseController {
 
     @PostMapping(path = "list")
     public Result<UserPageDTO> listUser(@RequestBody UserPageBO bo){
-        return  pcUserInfoBiz.listPage(bo);
+        Long userNo = getUserNo();
+        return  pcUserInfoBiz.listPage(bo,userNo);
     }
 
     public Result<String> importUser(MultipartFile file){
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/biz/PcUserInfoBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/biz/PcUserInfoBiz.java
index 7b38386..c34e713 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/user/pc/biz/PcUserInfoBiz.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/user/pc/biz/PcUserInfoBiz.java
@@ -36,7 +36,13 @@ public class PcUserInfoBiz {
     private UserDao userDao;
 
 
-    public Result<UserPageDTO> listPage(UserPageBO bo){
+
+    public Result<UserPageDTO> listPage(UserPageBO bo,Long userNo){
+        if(userNo == null){
+            return Result.error("权限不足");
+        }
+        User admin = userDao.getById(userNo);
+
         if(bo.getPageNo()<=0){
             bo.setPageNo(0);
         }else{
@@ -66,6 +72,7 @@ public class PcUserInfoBiz {
 //        Page<User> page =  userDao.findAll(example,pageable); // userDao.findAllByUserType(bo.getUserType(), pageable);
         Page<User> page = userDao.findAll((Specification<User>) (root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> pListAnd = new ArrayList<>();
+            pListAnd.add(criteriaBuilder.equal(root.get("schoolId"),userNo));
             pListAnd.add(criteriaBuilder.equal(root.get("userType"),bo.getUserType()));
             if(bo.getLevelId()>0){
                 pListAnd.add(criteriaBuilder.equal(root.get("level"),bo.getLevelId()));
diff --git a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java
index 64c0014..6279b03 100644
--- a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java
+++ b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java
@@ -124,6 +124,7 @@ public class ZhiyunAccountBiz {
         if(gradeVo !=null){
             user.setClassName(gradeVo.getName());
             user.setClassId(gradeVo.getOuterId());
+            user.setGmtCreate(new Date());
         }
         user.setLevelId(school.getLevelId());
         user.setName(name);