FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source
This commit is contained in:
Mr.Z
2021-08-12 09:48:53 +08:00
parent f3285453bf f43ac650e0
commit 0325b6b7ee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+2 -2
View File
@@ -106,8 +106,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override
public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","ts_user.uName");
wrapper.last("inner join sar_stand_project_library s on ts_user.USID = s.project_manager");
wrapper.select("distinct product_line","sar_stand_project_library.project_manager as projectManager","s.uName");
wrapper.last("inner join ts_user s on s.USID = sar_stand_project_library.project_manager");
Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal());