Explorar o código

流程文件下载

user5 %!s(int64=4) %!d(string=hai) anos
pai
achega
7abd002922

+ 8 - 0
src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1087,6 +1087,14 @@ public class WorkFullManageController extends BaseController {
 		for(int i = 1; i <=consultantList.size();i++){
 			consultantList.get(i-1).setId(i+"");
 		}
+		for (RuralReportConsultant info: consultantList) {
+			if(StringUtils.isBlank(info.getAuditOpinion())){
+				info.setAuditOpinion("");
+			}
+			if(StringUtils.isBlank(info.getZixunyuanName())){
+				info.setZixunyuanName("");
+			}
+		}
 		data.put("list",consultantList);
 		/*if(null != projectReportData.getPrincipalDate()){
 			//专业咨询员

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -437,7 +437,7 @@
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="officeId" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
-												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+												title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
 							</div>
 						</div>
 						<div style="clear:both;"></div>
@@ -676,4 +676,4 @@
     });
 </script>
 </body>
-</html>
+</html>