|
@@ -771,7 +771,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(null == list){
|
|
if(null == list){
|
|
|
- list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
|
|
|
|
|
|
|
+ list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper, projectReportData);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
@@ -966,7 +966,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(null == list){
|
|
if(null == list){
|
|
|
- list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
|
|
|
|
|
|
|
+ list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper,projectReportData);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
@@ -1161,7 +1161,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(null == list){
|
|
if(null == list){
|
|
|
- list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
|
|
|
|
|
|
|
+ list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper,projectReportData);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
@@ -1351,7 +1351,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
if(null == list){
|
|
if(null == list){
|
|
|
- list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
|
|
|
|
|
|
|
+ list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper,projectReportData);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|
|
List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
|