西格玛许 2 дней назад
Родитель
Сommit
a11b2d29cf

+ 9 - 8
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainExamEvaluationServiceImpl.java

@@ -15,19 +15,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 
-import org.dromara.main.domain.MainAbilityConfig;
-import org.dromara.main.domain.MainExamApply;
-import org.dromara.main.domain.MainExamEvaluation;
-import org.dromara.main.domain.MainStudent;
+import org.dromara.main.domain.*;
 import org.dromara.main.domain.bo.MainExamEvaluationBo;
 import org.dromara.main.domain.bo.MainExamEvaluationSyncBo;
 import org.dromara.main.domain.vo.MainExamApplyListVo;
 import org.dromara.main.domain.vo.MainExamSyncEmployeeOptionVo;
 import org.dromara.main.domain.vo.MainExamEvaluationVo;
-import org.dromara.main.mapper.MainAbilityConfigMapper;
-import org.dromara.main.mapper.MainExamApplyMapper;
-import org.dromara.main.mapper.MainExamEvaluationMapper;
-import org.dromara.main.mapper.MainStudentMapper;
+import org.dromara.main.mapper.*;
 import org.dromara.main.service.IMainExamEvaluationService;
 import org.springframework.stereotype.Service;
 import org.springframework.dao.DuplicateKeyException;
@@ -56,6 +50,7 @@ public class MainExamEvaluationServiceImpl implements IMainExamEvaluationService
     private final MainAbilityConfigMapper mainAbilityConfigMapper;
     private final MainStudentMapper mainStudentMapper;
     private final MainExamApplyMapper mainExamApplyMapper;
+    private final MainPositionMapper mainPositionMapper;
 
     @Override
     public MainExamEvaluationVo queryById(Long id) {
@@ -135,6 +130,12 @@ public class MainExamEvaluationServiceImpl implements IMainExamEvaluationService
     public Boolean insertByBo(MainExamEvaluationBo bo) {
         decodeDetailFieldInBo(bo);
         MainExamEvaluation add = BeanUtil.toBean(bo, MainExamEvaluation.class);
+        if (StringUtils.isBlank(add.getTenantId()) && add.getPositionId() != null) {
+            MainPosition position = mainPositionMapper.selectById(add.getPositionId());
+            if (position != null && StringUtils.isNotBlank(position.getTenantId())) {
+                add.setTenantId(position.getTenantId());
+            }
+        }
         validEntityBeforeSave(add);
 
         boolean flag = baseMapper.insert(add) > 0;