|
@@ -2404,6 +2404,8 @@ public class HealthReportController {
|
|
|
* 检查是否为授权代上传角色
|
|
* 检查是否为授权代上传角色
|
|
|
*/
|
|
*/
|
|
|
private boolean isProxyUploader(String role, List<String> roles, User user) {
|
|
private boolean isProxyUploader(String role, List<String> roles, User user) {
|
|
|
|
|
+ // 超级管理员(admin):平台最高权限,可代传任何报告
|
|
|
|
|
+ if ("admin".equals(role) || (roles != null && roles.contains("admin"))) return true;
|
|
|
if ("teacher".equals(role)) return true;
|
|
if ("teacher".equals(role)) return true;
|
|
|
if (roles != null && roles.contains("teacher")) return true;
|
|
if (roles != null && roles.contains("teacher")) return true;
|
|
|
if (user != null && "approved".equals(user.getNutritionistStatus())) return true;
|
|
if (user != null && "approved".equals(user.getNutritionistStatus())) return true;
|
|
@@ -2433,7 +2435,7 @@ public class HealthReportController {
|
|
|
|
|
|
|
|
User user = userMapper.selectById(userId);
|
|
User user = userMapper.selectById(userId);
|
|
|
if (!isProxyUploader(role, roles, user)) {
|
|
if (!isProxyUploader(role, roles, user)) {
|
|
|
- return Result.error("无权限代上传报告,仅规划师/营养师可操作");
|
|
|
|
|
|
|
+ return Result.error("无权限代上传报告,仅超级管理员/规划师/营养师可操作");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if (familyId == null) {
|
|
if (familyId == null) {
|