项目评估展示页根据权限展示问题修改

src/main/java/com/jeeplus/modules/projectAssess/web/ProjectAssessController.java

@@ -134,7 +134,14 @@ public class ProjectAssessController extends BaseController {
         if (projectAssessInfo!=null&&StringUtils.isNotBlank(projectAssessInfo.getId())) {
             projectAssessInfo = projectAssessService.queryProjectAssessDetail(projectAssessInfo);
         }
+        Role loginUserRole = new Role();
+        User user = UserUtils.getUser();
+        if (null != user.getRoleList()){
+            loginUserRole = user.getRoleList().get(0);
+
+        }
         model.addAttribute("projectAssess", projectAssessInfo);
+        model.addAttribute("loginUserRole", loginUserRole);
         return "modules/projectAssess/projectAssessView";
     }
 

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

@@ -164,7 +164,12 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		if(projectRecords!=null){
 			String cid = projectRecords.getWorkContractInfo().getId();
 			WorkContractInfo workContractInfo = contractInfoService.get(cid);
-			WorkClientInfo workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+			WorkClientInfo workClientInfo = new WorkClientInfo();
+			if(null != workContractInfo){
+				workClientInfo = workClientInfoService.get(workContractInfo.getClient().getId());
+			}else{
+				workContractInfo = new WorkContractInfo();
+			}
 			workContractInfo.setClient(workClientInfo);
 			projectRecords.setWorkContractInfo(workContractInfo);
 		}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -624,6 +624,11 @@ public class WorkInvoiceController extends BaseController {
 			map.put("reportName",projectRecords.getReportData().getName());
 			map.put("reportId",projectRecords.getReportData().getId());
 		}
+
+		if(null != projectRecords.getOffice()){
+			map.put("officeName",projectRecords.getOffice().getName());//部门
+			map.put("officeId",projectRecords.getOffice().getId());//部门
+		}
 		map.put("pNumber",projectRecords.getProjectId());//项目编号
 		map.put("projectId",projectRecords.getId());//项目id
 		map.put("cName",projectRecords.getWorkContractInfo().getClient().getName());//委托方

src/main/webapp/webpage/modules/biddingManagement/biddingManagementList.jsp

@@ -198,7 +198,7 @@
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
 
-					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
+					<shiro:hasPermission name="management:biddingManagement:add">
 						<table:addRow url="${ctx}/management/biddingManagement/form" title="新增投标信息"></table:addRow><!-- 增加按钮 -->
 					</shiro:hasPermission>
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>

src/main/webapp/webpage/modules/projectAssess/projectAssessForm.jsp

@@ -110,7 +110,7 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span class="require-item">*</span>公司名称：</label>
+                    <label class="layui-form-label double-line">公司名称：</label>
                     <div class="layui-input-block">
                         <input htmlEscape="false" id="companyName" name="companyName" readonly="readonly" class="form-control layui-input" value="${projectAssess.companyName}"/>
                     </div>

src/main/webapp/webpage/modules/projectAssess/projectAssessList.jsp

@@ -238,15 +238,15 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<shiro:hasPermission name="project:projectRecords:add">
+					<shiro:hasPermission name="project:projectAssess:add">
 						<table:addRow url="${ctx}/project/projectAssess/form" title="项目评估"></table:addRow><!-- 增加按钮 -->
 					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectRecords:del">
+					<shiro:hasPermission name="project:projectAssess:del">
 						<%--<table:delRow url="${ctx}/project/projectRecords/deleteAll" id="contentTable"></table:delRow><!-- 删除按钮 -->--%>
 					</shiro:hasPermission>
-					<shiro:hasPermission name="project:projectRecords:export">
+					<%--<shiro:hasPermission name="project:projectAssess:export">
 						<table:exportExcel url="${ctx}/project/projectAssess/export"></table:exportExcel><!-- 导出按钮 -->
-					</shiro:hasPermission>
+					</shiro:hasPermission>--%>
 					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i>&nbsp;刷新</button>
 					<div style="clear: both;"></div>
 				</div>

src/main/webapp/webpage/modules/projectAssess/projectAssessView.jsp

@@ -133,6 +133,7 @@
                     </div>
                 </div>
 
+                <c:if test="${loginUserRole.enname == 'zjl' || loginUserRole.enname == 'fzjl' || loginUserRole.enname == 'cw'}">
                 <div class="layui-item layui-col-sm6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>合同额：</label>
                     <div class="layui-input-block">
@@ -188,6 +189,7 @@
                         <form:input path="profit"  htmlEscape="false" pattern="#.00" readonly="true" class="form-control number required layui-input"/>
                     </div>
                 </div>
+                </c:if>
             </div>
             <div class="layui-item layui-col-xs12 with-textarea" >
                 <label class="layui-form-label double-line">负责项目的副总评估结论：</label>

src/main/webapp/webpage/modules/projectSpecialistAssess/projectSpecialistAssessList.jsp

@@ -194,7 +194,7 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
+					<shiro:hasPermission name="projectReport:projectSpecialistAssess:add">
 						<table:addRow url="${ctx}/projectReport/projectSpecialistAssess/form" title="专家评估"></table:addRow><!-- 增加按钮 -->
 					</shiro:hasPermission>
 					<%--<shiro:hasPermission name="projectReport:projectSpecialistAssess:add">