修改查询获取信息条件

src/main/java/com/jeeplus/common/utils/MenuStatusEnum.java

@@ -32,7 +32,8 @@ public enum MenuStatusEnum {
     WORK_STOCK("626a33e925754911940cf408ce07d996","物品采购"),
     WORK_INVOICE("89323021918e444bae3537521046d19f","开票管理"),
     WORK_RECORDS("22d943bb9e614ca69148743ff28e2362","项目登记"),
-    OVERALL_WORK_RECORDS("992321c897c64fc1bc4d6874eeeddf20","全过程项目登记"),
+    OVERALL_WORK_RECORDS("5bbf7fdd208149bf8b353d34b089ec09","全过程-工程咨询-项目登记"),
+    OVERALL_COST_WORK_RECORDS("20ce4621fb7d4831adc95cb83cbba756","全过程-造价审核-项目登记"),
     WORK_INVOICEDETAIL("84312d6a28e948b8b7b68185cf8d4d72","发票明细"),
     WORK_INVOICEALTER("89323021918e444bae3537521046d19f","开票管理"),
     WORK_CONTRACT_INFO("b9309305d94f4ee8b66eebbcae9f2db4","合同登记"),

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

@@ -175,9 +175,12 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 	public Page<RuralProjectRecords> findPage(Page<RuralProjectRecords> page, RuralProjectRecords projectRecords) {
 		//设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
-            String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
-			if(StringUtils.isBlank(dataScopeSql)){
+			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());
 			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectRecordsController.java

@@ -582,8 +582,8 @@ public class RuralCostProjectRecordsController extends BaseController {
     /**
      * 下载导入项目数据模板
      */
-    @RequiresPermissions("project:projectRecords:edit")
-    @RequestMapping(value = "downloadTemplate")
+	@RequiresPermissions(value={"ruralProject:ruralCostProjectRecords:add","ruralProject:ruralCostProjectRecords:edit"},logical=Logical.OR)
+	@RequestMapping(value = "downloadTemplate")
     public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
         try {
             new OSSClientUtil().downByStream(template_path,template_name,response,request.getHeader("USER-AGENT"));

src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectRecordsController.java

@@ -582,7 +582,7 @@ public class RuralProjectRecordsController extends BaseController {
     /**
      * 下载导入项目数据模板
      */
-    @RequiresPermissions("project:projectRecords:edit")
+    @RequiresPermissions(value={"ruralProject:ruralProjectRecords:add","ruralProject:ruralProjectRecords:edit"},logical=Logical.OR)
     @RequestMapping(value = "downloadTemplate")
     public void downloadTemplate(HttpServletRequest request,HttpServletResponse response) {
         try {