fix

haoban-manage3-service/pom.xml

@@ -48,12 +48,12 @@
         <groupId>com.gic</groupId>
         <artifactId>haoban-common</artifactId>
         <version>${haoban-common}</version>
-        <exclusions>
-        	<exclusion>
-        		<artifactId>jsqlparser</artifactId>
-        		<groupId>com.github.jsqlparser</groupId>
-        	</exclusion>
-        </exclusions>
+<!--         <exclusions> -->
+<!--         	<exclusion> -->
+<!--         		<artifactId>jsqlparser</artifactId> -->
+<!--         		<groupId>com.github.jsqlparser</groupId> -->
+<!--         	</exclusion> -->
+<!--         </exclusions> -->
         </dependency>
         <dependency>
             <groupId>com.gic</groupId>
@@ -89,12 +89,12 @@
             <groupId>com.gic</groupId>
             <artifactId>gic-enterprise-api</artifactId>
             <version>${gic-enterprise-api}</version>
-            <exclusions>
-            	<exclusion>
-            		<artifactId>jsqlparser</artifactId>
-            		<groupId>com.github.jsqlparser</groupId>
-            	</exclusion>
-            </exclusions>
+<!--             <exclusions> -->
+<!--             	<exclusion> -->
+<!--             		<artifactId>jsqlparser</artifactId> -->
+<!--             		<groupId>com.github.jsqlparser</groupId> -->
+<!--             	</exclusion> -->
+<!--             </exclusions> -->
         </dependency>
         <dependency>
 			<groupId>com.gic</groupId>

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -218,13 +218,12 @@ public class StaffApiServiceImpl implements StaffApiService {
 			return new Page<StaffDTO>();
 		}
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-//		Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
-//		List<StaffDTO> staffList = page.getResult();
-//		for (StaffDTO staffDTO : staffList) {
-//			staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId());
-//		}
-//		return  page;
-		return  PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
+		Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
+		List<StaffDTO> staffList = page.getResult();
+		for (StaffDTO staffDTO : staffList) {
+			staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId());
+		}
+		return  page;
 	}
 
 	@Override