huyc 项目档案代码提交

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TElecEmployeeInfoMapper.xml

@@ -44,10 +44,6 @@
 		a.ID,
 		a.EMP_NAME,
 		a.EMP_IDCARD,
-		b.EMP_NO,
-		b.UNIT_NAME,
-		b.DEPT_NO,
-		b.DEPT_NAME,
 		a.DATA_TYPE,
 		a.DELETE_FLAG,
 		a.UPDATE_BY,
@@ -104,13 +100,14 @@
 	<!--tElecEmployeeInfo简单分页查询-->
 	<select id="getTElecEmployeeInfoPage" resultMap="tElecEmployeeInfoMap">
 		SELECT
-		<include refid="Base_Column_List"/>
+		<include refid="Base_Column_List"/>,GROUP_CONCAT(distinct b.DEPT_NAME) as DEPT_NAME,GROUP_CONCAT(distinct b.UNIT_NAME) as UNIT_NAME,GROUP_CONCAT(distinct b.DEPT_NO) as DEPT_NO,GROUP_CONCAT(distinct b.EMP_NO) as EMP_NO
 		FROM t_elec_employee_info a
 		left join t_employee_project b on a.EMP_IDCARD = b.EMP_IDCARD
 		<where>
 			1=1  AND a.DELETE_FLAG = '0' AND b.DELETE_FLAG = '0'
 			<include refid="tElecEmployeeInfo_where"/>
 		</where>
-		order by a.CREATE_TIME desc
+		GROUP BY a.EMP_IDCARD
+		ORDER BY a.CREATE_TIME desc
 	</select>
 </mapper>