Merge remote-tracking branch 'origin/master'

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

@@ -32,6 +32,7 @@ public enum MenuStatusEnum {
     WORK_STOCK("626a33e925754911940cf408ce07d996","物品采购"),
     WORK_INVOICE("89323021918e444bae3537521046d19f","开票管理"),
     WORK_RECORDS("22d943bb9e614ca69148743ff28e2362","项目登记"),
+    SEAL_APPLY_FOR("07cb3390cc084fc8bd2617f62051ead2","盖章登记"),
     OVERALL_WORK_RECORDS("5bbf7fdd208149bf8b353d34b089ec09","全过程-工程咨询-项目登记"),
     OVERALL_COST_WORK_RECORDS("20ce4621fb7d4831adc95cb83cbba756","全过程-造价审核-项目登记"),
     OVERALL_WORK_RECORD_LIST("95f8a1999204460b9a78d1d20b85a0fb","全过程-工程咨询-项目列表"),

src/main/java/com/jeeplus/modules/ruralprojectrecords/entity/RuralProjectRecords.java

@@ -310,7 +310,7 @@ public class RuralProjectRecords extends ActEntity<RuralProjectRecords> {
 	private String caseStatus;				//案例项目的状态
 	private String caseProcessId;			//案例项目的流程id
 	private String ziXunBDE;			//上报中的咨询标的额
-	private String companyType;			//公司类型（1：赣能；2：东兴）
+	private String companyType;			//公司类型（1：赣能；0：东兴）
 
 
 

src/main/java/com/jeeplus/modules/sealApplyFor/service/SealApplyForService.java

@@ -133,7 +133,7 @@ public class SealApplyForService extends CrudService<SealApplyForDao, SealApplyF
         //设置数据权限
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
-            String dataScopeSql = dataScopeFilterOR(sealApplyForInfo.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            String dataScopeSql = dataScopeFilterOR(sealApplyForInfo.getCurrentUser(), "o", "u", "s", MenuStatusEnum.SEAL_APPLY_FOR.getValue());
             sealApplyForInfo.getSqlMap().put("dsf", dataScopeSql);
         }
         if(null!= sealApplyForInfo.getOffice() && StringUtils.isNotBlank(sealApplyForInfo.getOffice().getId())){