报告查询调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -634,7 +634,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
 
         long l1 = System.currentTimeMillis();
-        IPage<CwProjectReportData> list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
+        IPage<CwProjectReportData> list = null;
         long l2 = System.currentTimeMillis();
         System.out.println("报告列表查询service方法消耗时间:" + (l2-l1));
 
@@ -645,9 +645,15 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 RoleDTO dtoById = SpringUtil.getBean(IRoleApi.class).getRoleDTOById(roleDTO.getId());
                 if ("szbgqzgzdb".equals(dtoById.getEnName())){
                     list = reportMapper.findList2(page,isBmzr, officeIds.toString(), queryWrapper);
+                    break;
                 }
             }
         }
+
+        if(null == list){
+            list = reportMapper.findList(page,isBmzr, officeIds.toString(), queryWrapper);
+        }
+
         List<UserDTO> allUserInfo = (List<UserDTO>) RedisUtils.getInstance().get(CacheNames.USER_CACHE_USER_ALL_INFO);
         if (null == allUserInfo || allUserInfo.size() == 0) {
             allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();