1

science-admin/src/main/java/com/yiboshi/science/service/impl/ComExpertSpecServiceImpl.java

@@ -145,7 +145,7 @@ public class ComExpertSpecServiceImpl extends BaseServiceImpl<ComExpertSpecDAO,
             List<ComProjectGroupDetailDTO> finalMembers1 = members;
             list.forEach((e) -> {
                 boolean isDisabled = false;
-                String description = e.getTreeCode() + "/"+e.getSex() + "/" + AgeUtil.getResidentAge(e.getBirthday()) + "岁/" + e.getWorkUnit();
+                String description = e.getSex() + "/" + AgeUtil.getResidentAge(e.getBirthday()) + "岁/" + e.getWorkUnit();
                 isDisabled = units.contains(e.getUnitId());
                 // 检查专家的证件号是否在 members 列表中
                 if (!isDisabled)

science-admin/src/main/resources/mapper/ComExpertSpecDAO.xml

@@ -51,7 +51,7 @@
 
     <select id="getExpertListByExpertSpecIds" resultType="com.yiboshi.science.param.dto.ComExpertDTO">
         select distinct  a.expert_id id,c.person_name,c.cert_id,c.sex,c.birthday,e.id unit_id,
-                         (case when e.unit_name is null then c.work_unit else e.unit_name end) as work_unit,d.tree_code
+                         (case when e.unit_name is null then c.work_unit else e.unit_name end) as work_unit
         from com_expert_spec a
                  left join com_expert b on a.expert_id=b.id
                  left join com_person c on b.person_id=c.id

science-admin/src/main/resources/mapper/ComProjectGroupDAO.xml

@@ -27,6 +27,7 @@
             left join com_person c on b.person_id = c.id
         where a.proj_id = #{projectId}
     </select>
+
     <select id="getProjectAssignByGroupIdExpertId" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
         select a.id as group_id, d.*, e.proj_no, e.app_no, e.proj_class, e.proj_name from com_project_group a
             left join com_project_group_detail b on a.id = b.group_id