Compare commits

..

No commits in common. "7834754dd3ee8016c998d5f66da12faffbb9b407" and "554a0893c3c5155685dc6b8276c24d33260345be" have entirely different histories.

View File

@ -1,13 +1,11 @@
package org.cmh.backend.UserManagement.controller; package org.cmh.backend.UserManagement.controller;
import io.jsonwebtoken.JwtParser;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import org.cmh.backend.OrganizationManagement.service.OrganizationService; import org.cmh.backend.OrganizationManagement.service.OrganizationService;
import org.cmh.backend.UserManagement.adpter.User2UserHS; import org.cmh.backend.UserManagement.adpter.User2UserHS;
import org.cmh.backend.UserManagement.adpter.UserHS2User; import org.cmh.backend.UserManagement.adpter.UserHS2User;
import org.cmh.backend.UserManagement.service.UserManagementService; import org.cmh.backend.UserManagement.service.UserManagementService;
import org.cmh.backend.UserManagement.model.User; import org.cmh.backend.UserManagement.model.User;
import org.cmh.backend.Utils.JwtUtil;
import org.cmh.backend.Utils.JwtVerify; import org.cmh.backend.Utils.JwtVerify;
import org.cmh.backend.authentication.dto.UserProfileResponse; import org.cmh.backend.authentication.dto.UserProfileResponse;
import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.authentication.model.UserHS;
@ -54,16 +52,10 @@ public class UserManagementController {
@GetMapping("/getAll") @GetMapping("/getAll")
@JwtVerify @JwtVerify
public List<User> getAll(@RequestParam String token) { public List<User> getAll(@RequestParam String token) {
String username = JwtUtil.extractUsername(token); // 这里分权限进行不同请求
UserHS userHS = userService.getUserByUsername(username); //这里getAll??
List<UserHS> userHSList = userService.getAllUsers(); List<UserHS> userHSList = userService.getAllUsers();
//这里分权限进行不同请求
//超级管理员
if(userHS.getSuperAdmin()){
return UserHS2User.convertList(userHSList); return UserHS2User.convertList(userHSList);
}else{
return null;
}
} }