Merge remote-tracking branch 'origin/master'

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

@@ -10,11 +10,12 @@
     </sql>
 
     <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComTalentApplyDTO">
-        select a.id, a.person_id, a.report_year, a.app_unit_id, a.talent_type, a.talent_state, a.research_type,
-        a.apply_fund, a.other_fund, a.total_fund, b.cert_id, b.person_name, b.duty, b.title, b.spec
+        select a.*, b.cert_id, b.person_name, b.sex, b.mobile, b.duty, b.title, b.spec, i.name as title_name, j.name as spec_name
         from com_talent_apply a
         left join com_person b on a.person_id = b.id
         left join com_unit d on a.app_unit_id = d.id
+        left join system_parameter i on b.title = i.id and i.type_id = 7
+        left join system_parameter j on b.spec = j.id and j.type_id = 68
         <where>
             ${ew.sqlSegment}
         </where>