From 430477c7e0777531f22fc18dc8906ea75cdc21d9 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 03 十二月 2025 16:53:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
index 3c54ebf..2704fea 100644
--- a/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
+++ b/multi-system/src/main/java/com/gkhy/exam/system/service/impl/InternalAuditEvaluateServiceImpl.java
@@ -4,6 +4,7 @@
import com.gkhy.exam.common.api.CommonPage;
import com.gkhy.exam.common.api.CommonResult;
import com.gkhy.exam.common.domain.entity.SysUser;
+import com.gkhy.exam.common.enums.UserTypeEnum;
import com.gkhy.exam.common.exception.ApiException;
import com.gkhy.exam.common.utils.PageUtils;
import com.gkhy.exam.common.utils.SecurityUtils;
@@ -45,12 +46,14 @@
@Override
public CommonResult insertEvaluate(InternalAuditEvaluate evaluate) {
SysUser user = SecurityUtils.getLoginUser().getUser();
- if (!user.getUserType().equals(0)&&!user.getUserType().equals(1)){
+ if (!user.getUserType().equals(UserTypeEnum.SYSTEM_USER.getCode())&&!user.getUserType().equals(UserTypeEnum.COMPANY_USER.getCode())&&!user.getUserType().equals(UserTypeEnum.COMPANY_ADMIN.getCode())){
throw new ApiException("普通用户无法添加相关数据");
}
ExStudent exStudent = exStudentMapper.selectStudentById(Long.valueOf(evaluate.getPersonId()));
- if (user.getDeptId().equals(exStudent.getDeptId())){
- throw new ApiException("请勿选择本部门成员");
+ if ( user.getDeptId()!=null){
+ if ( user.getDeptId().equals(exStudent.getDeptId())) {
+ throw new ApiException("请勿选择本部门成员");
+ }
}
evaluate.setCreateBy(SecurityUtils.getUsername());
evaluate.setCreateTime(LocalDateTime.now());
--
Gitblit v1.9.2