修改项目负责人

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

@@ -116,15 +116,15 @@ public class RuralCostProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-			if (records1.getWorkContractInfo() == null) {
-				projectRecordsService.queryLinkmanInfos(records1);
-				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-					WorkContractInfo contractInfo = new WorkContractInfo();
-					contractInfo.setClient(linkman.getClientId());
-					records1.setWorkContractInfo(contractInfo);
-				}
-			}
+//			if (records1.getWorkContractInfo() == null) {
+//				projectRecordsService.queryLinkmanInfos(records1);
+//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//					WorkContractInfo contractInfo = new WorkContractInfo();
+//					contractInfo.setClient(linkman.getClientId());
+//					records1.setWorkContractInfo(contractInfo);
+//				}
+//			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

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

@@ -119,15 +119,15 @@ public class RuralProjectRecordsController extends BaseController {
 		List<RuralProjectRecords> list = page.getList();
 		for (int i = 0; i < list.size(); i++) {
 			RuralProjectRecords records1 = list.get(i);
-			if (records1.getWorkContractInfo() == null) {
-				projectRecordsService.queryLinkmanInfos(records1);
-				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
-					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
-					WorkContractInfo contractInfo = new WorkContractInfo();
-					contractInfo.setClient(linkman.getClientId());
-					records1.setWorkContractInfo(contractInfo);
-				}
-			}
+//			if (records1.getWorkContractInfo() == null) {
+//				projectRecordsService.queryLinkmanInfos(records1);
+//				if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+//					WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+//					WorkContractInfo contractInfo = new WorkContractInfo();
+//					contractInfo.setClient(linkman.getClientId());
+//					records1.setWorkContractInfo(contractInfo);
+//				}
+//			}
 			//判断是否为admin
 			if (UserUtils.isManager()){
 				records1.setFlagAdmin("1");

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -802,14 +802,15 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+<%--                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"--%>
+<%--                                        title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                        <form:input path="createBy.office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsForm.jsp

@@ -823,14 +823,15 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
                     <div class="layui-input-block  with-icon">
-                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"
-                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <form:input path="createBy.name" htmlEscape="false"  readonly="true"  class="form-control  layui-input"/>
+<%--                        <sys:inquireselectUser id="master" name="projectLeaders" value="${ruralProjectRecords.leaderIds}" labelName="leaderNameStr" labelValue="${ruralProjectRecords.leaderNameStr}"--%>
+<%--                                         title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label">所属部门：</label>
                     <div class="layui-input-block">
-                        <form:input path="officeName" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
+                        <form:input path="createBy.office.name" htmlEscape="false" id="officeName" class="form-control layui-input" readonly="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">