Jelajahi Sumber

修复测评的岗位类型展示问题

jialuyu 2 minggu lalu
induk
melakukan
330e7a7ec9

+ 2 - 1
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/MainExamEvaluationServiceImpl.java

@@ -77,7 +77,8 @@ public class MainExamEvaluationServiceImpl implements IMainExamEvaluationService
         lqw.like(StringUtils.isNotBlank(bo.getEvaluationName()), "e.evaluation_name", bo.getEvaluationName());
         lqw.eq(StringUtils.isNotBlank(bo.getGrade()), "e.grade", bo.getGrade());
         lqw.eq(bo.getPositionId() != null, "e.position_id", bo.getPositionId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPositionType()), "e.position_type", bo.getPositionType());
+        lqw.and(StringUtils.isNotBlank(bo.getPositionType()), 
+            w -> w.eq("e.position_type", bo.getPositionType()).or().eq("p.post_type", bo.getPositionType()));
         // 2. 业务状态搜索逻辑
         if (StringUtils.isNotBlank(bo.getStatus())) {
             Date now = new Date();

+ 1 - 1
ruoyi-modules/ruoyi-main/src/main/resources/mapper/MainExamEvaluationMapper.xml

@@ -39,7 +39,7 @@
 
     <sql id="selectMainExamEvaluationVo">
         SELECT
-            e.id, e.evaluation_name, e.grade, e.position_id, e.position_type,
+            e.id, e.evaluation_name, e.grade, e.position_id, IF(e.position_type IS NULL OR e.position_type = '', p.post_type, e.position_type) AS position_type,
             e.tags, e.main_image, e.image_album, e.detail, e.price,
             e.on_time, e.down_time, e.status,
             e.tenant_id, e.create_dept, e.create_by, e.create_time,