diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java b/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java index 3a88afd..3f955c2 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/LoginUserController.java @@ -5,6 +5,7 @@ import com.yunhai.bschclassmanage.utils.UserContext; import com.yunhai.bschclassmanage.config.Config; import com.yunhai.platform.openapi.client.YschBaseOpenApi; import com.yunhai.platform.utils.model.BoaModule; +import com.yunhai.platform.utils.model.BoaUser; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,6 +22,16 @@ import java.util.List; @CrossOrigin(originPatterns = {"*"}, allowCredentials = "true") public class LoginUserController { + @GetMapping("getUserMod") + public List getUserMod() { + return YschBaseOpenApi.getUserModule(UserContext.getUserId(),UserContext.getSchId()); + } + + @GetMapping("getUserInfo") + public BoaUser getUserInfo(BoaUser authUserWithDept) { + return authUserWithDept; + } + @GetMapping("Logout") protected void logout(HttpServletRequest request) { HttpSession session = request.getSession(); diff --git a/src/main/java/com/yunhai/bschclassmanage/controller/api/SchsystemController.java b/src/main/java/com/yunhai/bschclassmanage/controller/api/SchsystemController.java index 9eab564..5acf785 100644 --- a/src/main/java/com/yunhai/bschclassmanage/controller/api/SchsystemController.java +++ b/src/main/java/com/yunhai/bschclassmanage/controller/api/SchsystemController.java @@ -40,7 +40,7 @@ public class SchsystemController { Integer roleId = UserContext.getRoleId(); boolean isSuperAdmin = UserType.SUPER_ADMINISTRATOR.getId().equals(UserContext.getType()); - boolean isAreaAdmin = UserRole.AREAADMIN.getValue().equals(roleId); + boolean isAreaAdmin = !isSuperAdmin && UserRole.AREAADMIN.getValue().equals(roleId); if (!isSuperAdmin && !isAreaAdmin) { throw new DException("无权操作,仅超级管理员或学校管理员可设置学制"); @@ -82,7 +82,7 @@ public class SchsystemController { // 2. 角色权限校验 Integer roleId = user.getRoleId(); boolean isSuperAdmin = UserType.SUPER_ADMINISTRATOR.getId().equals(UserContext.getType()); - boolean isAreaAdmin = UserRole.AREAADMIN.getValue().equals(roleId); + boolean isAreaAdmin =!isSuperAdmin && UserRole.AREAADMIN.getValue().equals(roleId); if (!isSuperAdmin && !isAreaAdmin) { throw new DException("无权操作,仅超级管理员或学校管理员可设置学制");