公司级报表项目信息查询修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -3409,20 +3409,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		Map<String,String> map = statementCompanyComprehensiveService.getDate(new Integer(bigDateType),new Integer(smallDateType));
 		String beginDate = map.get("beginDate");
         String endDate = map.get("endDate");
-		//设置数据权限
-		if(!UserUtils.getUser().isAdmin()) {
-			String dataScopeSql = null;
-			//判断查询为工程咨询信息
-			if("1".equals(projectRecords.getProjectType())){
-				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
-			} else if("2".equals(projectRecords.getProjectType())){//判断查询为造价审核信息
-				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_COST_WORK_RECORDS.getValue());
-			}else{
-				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
-			}
-			projectRecords.getSqlMap().put("dsf", dataScopeSql);
-			projectRecords.getSqlMap().put("delFlag", "AND a.del_flag = 0");
-		}
 		if(null!= projectRecords.getOffice() && StringUtils.isNotBlank(projectRecords.getOffice().getId())){
 			//查询该选择节点下所有的部门Id
 			List<String> officeIdList = officeService.getChildrenOffice(projectRecords.getOffice().getId());

src/main/java/com/jeeplus/modules/statement/controller/StatementCompanyComprehensiveController.java

@@ -128,7 +128,7 @@ public class StatementCompanyComprehensiveController extends BaseController {
             model.addAttribute("flag","1");
         }
         //添加查询类型(造价审核)
-        projectRecords.setProjectType("2");
+        //projectRecords.setProjectType("2");
         //获取项目信息
         Page<RuralProjectRecords> page = projectRecordsService.findReportPage(new Page<RuralProjectRecords>(request, response), projectRecords,officeId,grade,bigDateType,smallDateType,recordState,reportedState);