Skip to content

H
haoban-manage3.0
Commit a6b362e8 by qwmqiuwenmin
Options

fix

parent b11766ae
Showing with 18 additions and 19 deletions
haoban-manage3-service/pom.xml
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>haoban-common</artifactId> <artifactId>haoban-common</artifactId>
<version>${haoban-common}</version> <version>${haoban-common}</version>
<exclusions> <!-- <exclusions> -->
<exclusion> <!-- <exclusion> -->
<artifactId>jsqlparser</artifactId> <!-- <artifactId>jsqlparser</artifactId> -->
<groupId>com.github.jsqlparser</groupId> <!-- <groupId>com.github.jsqlparser</groupId> -->
</exclusion> <!-- </exclusion> -->
</exclusions> <!-- </exclusions> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
...@@ -89,12 +89,12 @@ ...@@ -89,12 +89,12 @@
<groupId>com.gic</groupId> <groupId>com.gic</groupId>
<artifactId>gic-enterprise-api</artifactId> <artifactId>gic-enterprise-api</artifactId>
<version>${gic-enterprise-api}</version> <version>${gic-enterprise-api}</version>
<exclusions> <!-- <exclusions> -->
<exclusion> <!-- <exclusion> -->
<artifactId>jsqlparser</artifactId> <!-- <artifactId>jsqlparser</artifactId> -->
<groupId>com.github.jsqlparser</groupId> <!-- <groupId>com.github.jsqlparser</groupId> -->
</exclusion> <!-- </exclusion> -->
</exclusions> <!-- </exclusions> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gic</groupId> <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 { ...@@ -218,13 +218,12 @@ public class StaffApiServiceImpl implements StaffApiService {
return new Page<StaffDTO>(); return new Page<StaffDTO>();
} }
PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize()); PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
// Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class); Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
// List<StaffDTO> staffList = page.getResult(); List<StaffDTO> staffList = page.getResult();
// for (StaffDTO staffDTO : staffList) { for (StaffDTO staffDTO : staffList) {
// staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId()); staffDTO.setDepartmentIds(map.get(staffDTO.getStaffId()) == null?null:map.get(staffDTO.getStaffId()).getDepartmentId());
// } }
// return page; return page;
return PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, ""),StaffDTO.class);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment