From 8b8c31625a987f51f35e51a291755ad9889b9baf Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: Fri, 05 Jun 2026 14:36:24 +0800
Subject: [PATCH] 功能修改

---
 expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml b/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
index 00a1709..0dfff1f 100644
--- a/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
+++ b/expert-system/src/main/resources/mapper/system/SysExpertInfoMapper.xml
@@ -8,7 +8,7 @@
                graduation_school,degree,speciality,current_profession,support_direction_safety,
                support_direction_prevention,support_direction_emergency,resume_key,paper_situation_key,
                reward_key,achievement_key,personal_opinion_key,recommend_unit_opinion_key,remark,create_by,
-               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id,domain,evidence
+               create_time,big_classify,small_classify,del_flag,source,rating_level,employment_date_start,employment_date_end,expert_certificate,dept_id,domain,evidence,academic_certificate
         from sys_expert_info
     </sql>
 
@@ -22,7 +22,7 @@
     <select id="expertInfoList" resultType="com.gkhy.system.domain.SysExpertInfo">
         select id,name,sex,birthday,phone,title,degree,state,speciality,big_classify,small_classify,id_card,company_name,evidence,
             domain,level,current_profession,duty_status,support_direction_safety,support_direction_prevention,support_direction_emergency,create_time,
-            rating_level,employment_date_start,employment_date_end,expert_certificate,update_time from sys_expert_info
+            rating_level,employment_date_start,employment_date_end,expert_certificate,update_time,academic_certificate from sys_expert_info
         <where>
             and del_flag = 0
             <if test="name != null and name != ''">
@@ -74,7 +74,9 @@
         select a.id,a.name,a.sex,a.birthday,a.phone,a.title,a.degree,a.state,a.speciality,a.big_classify bigClassify,a.small_classify smallClassify,a.id_card idCard,a.company_name companyName,a.evidence,
         a.domain,a.level,a.current_profession currentProfession,a.duty_status dutyStatus,a.support_direction_safety supportDirectionSafety,
         a.support_direction_prevention supportDirectionPrevention,a.support_direction_emergency supportDirectionEmergency,a.create_time createTime,
-        a.rating_level ratingLevel,a.employment_date_start employmentDateStart,a.employment_date_end employmentDateEnd,a.expert_certificate expertCertificate,a.update_time updateTime ,b.classify_name as bigClassifyName from sys_expert_info a
+        a.rating_level ratingLevel,a.employment_date_start employmentDateStart,a.employment_date_end employmentDateEnd,a.expert_certificate expertCertificate,a.update_time updateTime ,b.classify_name as bigClassifyName
+        ,a.academic_certificate as academicCertificate
+        from sys_expert_info a
          left join  sys_expert_classify b on a.big_classify = b.id
         <where>
             and a.del_flag = 0
@@ -148,7 +150,7 @@
 
     <select id="getExpertRound" parameterType="com.gkhy.system.domain.vo.request.SysExpertInfoRoundReq"
             resultType="com.gkhy.system.domain.vo.response.ProjectExpertSectionResp">
-        select id,name,sex,id_card idCard,
+        select id ,name,sex,id_card idCard,
             domain,rating_level ratingLevel from sys_expert_info
         where del_flag = 0
             <if test="deptId != null "> and dept_id = #{deptId}</if>
@@ -164,6 +166,10 @@
             #{item}
         </foreach>
         </if>
+        <!--去除掉组长-->
+        <if test="selectedUserId != null">
+            and id != #{selectedUserId}
+        </if>
         ORDER BY RAND()
             LIMIT #{num}
     </select>

--
Gitblit v1.9.2