Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitCapitalDemandController.java

@@ -162,7 +162,34 @@ public class ExternalUnitCapitalDemandController extends BaseController {
         //项目基本信息
         ExternalUnitProjectRecords externalUnitProjectRecords = unitProjectRecordsService.get(capitalDemand.getProjectId());
         capitalDemand.setProject(externalUnitProjectRecords);
+//项目组成员
+        ArrayList<User> users = new ArrayList<>();
+        if (StringUtils.isNotBlank(externalUnitProjectRecords.getProjectMember())){
+            if (externalUnitProjectRecords.getProjectMember().contains(",")){
+                String[] split = externalUnitProjectRecords.getProjectMember().split(",");
+                for (String s : split) {
+                    User user = UserUtils.get(s);
+                    if (user.getRoleList() != null){
+                        for (Role role : user.getRoleList()) {
+                            if (role.getEnname().equals("sgf")){
+                                users.add(user);
+                            }
+                        }
+                    }
 
+                }
+            }else {
+                User user = UserUtils.get(externalUnitProjectRecords.getProjectMember());
+                if (user.getRoleList() != null){
+                    for (Role role : user.getRoleList()) {
+                        if (role.getEnname().equals("sgf")){
+                            users.add(user);
+                        }
+                    }
+                }
+            }
+        }
+        model.addAttribute("projectMembers", users);
         model.addAttribute("capitalDemand", capitalDemand);
         return "modules/externalUnit/capitalDemandFormView";
     }

src/main/webapp/webpage/modules/externalUnit/capitalDemandFormView.jsp

@@ -175,6 +175,17 @@
 			</div>
 			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>基本信息</h2></div>
+				<div class="layui-item layui-col-sm6 lw6">
+					<label class="layui-form-label"><span class="require-item">*</span>审核人：</label>
+					<div class="layui-input-block">
+						<form:select path="examiner" cssClass="form-control required judgment simple-select" disabled="true">
+							<form:option value="" label=""/>
+							<c:forEach items="${projectMembers}" var="member">
+								<option value="${member.id}" <c:if test="${capitalDemand.examiner==member.id}">selected</c:if> >${member.name}</option>
+							</c:forEach>
+						</form:select>
+					</div>
+				</div>
 				<div class="layui-item layui-col-sm12 lw6 with-textarea">
 					<label class="layui-form-label "><span class="require-item">*</span>备注：</label>
 					<div class="layui-input-block">