功能调整

sale
tianea 3 years ago
parent 326bbc8d3e
commit 5df5561216

@ -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){

@ -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()));

@ -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);

Loading…
Cancel
Save