项目查询列表权限展示修改

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","项目登记"),
+    OVERALL_WORK_RECORDS("992321c897c64fc1bc4d6874eeeddf20","全过程项目登记"),
     WORK_INVOICEDETAIL("84312d6a28e948b8b7b68185cf8d4d72","发票明细"),
     WORK_INVOICEALTER("89323021918e444bae3537521046d19f","开票管理"),
     WORK_CONTRACT_INFO("b9309305d94f4ee8b66eebbcae9f2db4","合同登记"),
@@ -48,6 +49,7 @@ public enum MenuStatusEnum {
     WORK_PROJECTDEPOSIT("723592e24a3d48bdb2ef109b8ee46837","保证金管理"),
     WORK_REIMBURSEMENT("8873bbcf4b42445f8117108769358a5c","报销申请"),
     PROJECT_RECORDSALTER("22d943bb9e614ca69148743ff28e2362","项目变更"),
+    OVERALL_PROJECT_RECORDSALTER("992321c897c64fc1bc4d6874eeeddf20","全过程项目变更"),
     PROJECT_REPORTDATA("1a098f10396f462a95d20d712722973a","报告申请"),
     PROJECT_REPORTRECORD("67fdc15ef4f149ec8dfda74f0e1612fc","报告归档"),
     WORK_RECEIPTSSETTLE("084471d4393044d4802e3e27f71988f3","收入结算"),

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectImplementEarlyService.java

@@ -115,6 +115,9 @@ public class ProjectImplementEarlyService extends CrudService<ProjectImplementEa
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(org.apache.commons.lang3.StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         Integer count = dao.getProjectRecodesCount(projectRecords);

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsAlterService.java

@@ -117,7 +117,15 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
 
 	public Page<ProjectRecordsAlter> findPage(Page<ProjectRecordsAlter> page, ProjectRecordsAlter projectRecords) {
 		//设置数据权限
-		projectRecords.getSqlMap().put("dsf", dataScopeFilter(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PROJECT_RECORDSALTER.getValue()));
+        //设置数据权限
+        if(!UserUtils.getUser().isAdmin()) {
+            String dataScopeSql = dataScopeFilter(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PROJECT_RECORDSALTER.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilter(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_PROJECT_RECORDSALTER.getValue());
+            }
+            projectRecords.getSqlMap().put("dsf", dataScopeSql);
+        }
+		//projectRecords.getSqlMap().put("dsf", dataScopeFilter(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PROJECT_RECORDSALTER.getValue()));
 		projectRecords.setPage(page);
 		List<ProjectRecordsAlter> recordsList = findList(projectRecords);
 		//查询负责人信息
@@ -580,8 +588,10 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
                         projectRecordsAlter.setProjectStatus(AlterStatusEnum.RECALL.getValue());
                         workActivityProcess.setIsApproval("2");
                         vars.put("pass", false);
+                        vars.put("passs", false);
                     } else {
                         vars.put("pass", true);
+                        vars.put("passs", true);
                         workActivityProcess.setIsApproval("1");
                     }
                     break;
@@ -612,9 +622,11 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
                             workActivityProcess.setId("");
                         }
                         vars.put("pass", false);
+                        vars.put("passs", false);
                     } else {
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass", true);
+                        vars.put("passs", true);
                     }
                     break;
                 }
@@ -634,10 +646,12 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
                     if ("yes".equals(projectRecordsAlter.getAct().getFlag())) {
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass", true);
+                        vars.put("passs", true);
                         notifyRole = "审批通过";
                     } else {
                         workActivityProcess.setIsApproval("2");
                         vars.put("pass", false);
+                        vars.put("passs", false);
                         user = createUser;
                         notifyRole = "调整项目变更";
                     }
@@ -649,11 +663,13 @@ public class ProjectRecordsAlterService extends CrudService<ProjectRecordsAlterD
                     if("yes".equals(projectRecordsAlter.getAct().getFlag())){
                         workActivityProcess.setIsApproval("1");
                         vars.put("pass",true);
+                        vars.put("passs",true);
                         notifyRole = "部门负责人审批";
                     }else{
                         workActivityProcess.setIsApproval("2");
                         projectRecordsAlter.setProjectStatus(AlterStatusEnum.RECALL.getValue());
                         vars.put("pass",false);
+                        vars.put("passs",false);
                     }
                     break;
                 }

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -192,6 +192,9 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		//设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         int count = dao.queryCount(projectRecords);
@@ -214,6 +217,9 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
 			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+			if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
 			projectRecords.getSqlMap().put("dsf", dataScopeSql);
 		}
         int count = dao.queryCountByStatus(projectRecords);

src/main/java/com/jeeplus/modules/projectrecord/service/completion/ProjectCompletionPigeonholeService.java

@@ -15,6 +15,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,9 @@ public class ProjectCompletionPigeonholeService extends CrudService<ProjectCompl
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         Integer count = dao.getProjectRecodesCount(projectRecords);

src/main/java/com/jeeplus/modules/projectrecord/service/early/ProjectEarlyPigeonholeService.java

@@ -16,6 +16,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,9 @@ public class ProjectEarlyPigeonholeService extends CrudService<ProjectCompletion
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         Integer count = dao.getProjectRecodesCount(projectRecords);

src/main/java/com/jeeplus/modules/projectrecord/service/early/ProjectEarlyReviewService.java

@@ -16,6 +16,7 @@ import com.jeeplus.modules.sys.utils.UserUtils;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,9 @@ public class ProjectEarlyReviewService extends CrudService<ProjectEarlyReviewDao
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         Integer count = dao.getProjectRecodesCount(projectRecords);

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

@@ -144,6 +144,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
         //设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+            if(StringUtils.isBlank(dataScopeSql)){
+                dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+            }
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         int count = dao.queryCount(projectRecords);

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

@@ -176,6 +176,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//设置数据权限
         if(!UserUtils.getUser().isAdmin()) {
             String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+			if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
             projectRecords.getSqlMap().put("dsf", dataScopeSql);
         }
         int count = dao.queryCount(projectRecords);
@@ -198,6 +201,9 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
 			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
+			if(StringUtils.isBlank(dataScopeSql)){
+				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
+			}
 			projectRecords.getSqlMap().put("dsf", dataScopeSql);
 		}
         int count = dao.queryCountByStatus(projectRecords);

src/main/webapp/webpage/modules/projectrecord/projectRecordsAlterForm.jsp

@@ -638,7 +638,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label double-line">建筑面积或规模：</label>
                     <div class="layui-input-block"><%-- onchange="getFee()"--%>
-                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input required number"/>
+                        <form:input path="buildingScale" htmlEscape="false"  class="form-control layui-input number"/>
                     </div>
                 </div>
                 <%--<div class="layui-item layui-col-sm6 lw7">