线上问题修改

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -94,12 +94,18 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 
 	@Override
 	public IPage<TEmployeeInfo> getLeavePage(Page<TEmployeeInfo> page, TEmployeeInfo employeeInfo) {
-		List<String> projectList = baseMapper.getProjectEmpId(employeeInfo);
 		long leavePageCount;
-		if (projectList.isEmpty()) {
-			leavePageCount = 0L;
+		if (Common.isEmpty(employeeInfo.getUnitName()) && Common.isEmpty(employeeInfo.getDeptName())
+				&& Common.isEmpty(employeeInfo.getDeptNo()) && Common.isEmpty(employeeInfo.getAuthSql())) {
+			leavePageCount = baseMapper.getLeavePageCount(employeeInfo, null);
 		} else {
-			leavePageCount = baseMapper.getLeavePageCount(employeeInfo, projectList);
+			List<String> projectList;
+			projectList = baseMapper.getProjectEmpId(employeeInfo);
+			if (projectList.isEmpty()) {
+				leavePageCount = 0L;
+			}else {
+				leavePageCount = baseMapper.getLeavePageCount(employeeInfo, projectList);
+			}
 		}
 		page.setTotal(leavePageCount);
 		if (leavePageCount > 0L) {

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

@@ -506,7 +506,23 @@
 	<!-- hgw 分页查询 -->
 	<select id="getLeavePage" resultMap="tEmployeeExportMap">
 		SELECT
-		*
+		c.ID,
+		c.EMP_CODE,
+		c.EMP_NATRUE,
+		c.EMP_NAME,
+		c.EMP_IDCARD,
+		c.EMP_PHONE,
+		c.FILE_PROVINCE,
+		c.FILE_CITY,
+		c.FILE_TOWN,
+		c.LEAVE_TIME,
+		c.LEAVE_USER_NAME,
+		c.CREATE_TIME,
+		b.DEPT_ID,
+		b.EMP_ID,
+		b.UNIT_NAME,
+		b.DEPT_NAME,
+		b.DEPT_NO
 		FROM
 		(
 		SELECT