组织管理分页查询车牌findAll，组织人员管理loginUserId添加

src/manager/cn/com/yskj/zfdm/manager/organizationpersonnel/OrganizationPersonnelManager.java

@@ -4,6 +4,7 @@ import javax.validation.Valid;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.yskj.zfdm.entity.User;
 import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel;
 import cn.com.yskj.zfdm.model.organizationpersonnel.OrganizationPersonnelModel;
 import cn.com.yskj.zfdm.repo.request.organizationpersonnel.OrganizationPersonnelPageRequest;
@@ -20,7 +21,7 @@ public interface OrganizationPersonnelManager {
 	Pagination queryPage(OrganizationPersonnelPageRequest queryModel);
 
 	//添加方法
-	void add(@Valid OrganizationPersonnelModel opm)throws  ManagerException;
+	void add(@Valid OrganizationPersonnelModel opm,User user)throws  ManagerException;
 	
 	//通过id查询
 	OrganizationPersonnel findById(String id);

src/manager/cn/com/yskj/zfdm/manager/organizationpersonnel/OrganizationPersonnelManagerImpl.java

@@ -13,6 +13,7 @@ import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
+import cn.com.yskj.zfdm.entity.User;
 import cn.com.yskj.zfdm.entity.dict.OrgLevelType;
 
 import cn.com.yskj.zfdm.entity.zfd.OrganizationPersonnel;
@@ -51,7 +52,7 @@ public class OrganizationPersonnelManagerImpl extends AbstractManager implements
 	 * 添加方法
 	 */
 	@Override
-	public void add(@Valid OrganizationPersonnelModel opm) throws ManagerException {
+	public void add(@Valid OrganizationPersonnelModel opm,User user) throws ManagerException {
 		
 		// 组织表中的组织编号
 		if (zoRepo.findByOrgNameId(opm.getOrgName()) != null) {
@@ -61,7 +62,7 @@ public class OrganizationPersonnelManagerImpl extends AbstractManager implements
 			String orgId = orgLevel + "_" + id;
 			OrganizationPersonnel op = new OrganizationPersonnel();
 			op.setOrgId(orgId);
-			op.setLoginUserId("admin");
+			op.setLoginUserId(user.getId());
 			op.setOrgName(zo.getOrgName());
 			if(opm.getName()!=null){
 			op.setName(opm.getName());

src/manager/cn/com/yskj/zfdm/manager/zfdorg/ZfdOrgManagerImpl.java

@@ -153,7 +153,7 @@ public class ZfdOrgManagerImpl extends AbstractManager implements ZfdOrgManager
 		org.setOrgSuperiorName(queryModel.getOrgSuperiorName());
 		zoRepo.save(org);
 		}else {
-			throw new ManagerException("只能添加到三级组织");
+			throw new ManagerException("最多只能添加到三级组织");
 		}
 	}
 }

src/web/cn/com/yskj/zfdm/web/organizationpersonnel/OrganizationPersonnelController.java

@@ -79,7 +79,7 @@ public class OrganizationPersonnelController extends BaseLogController {
 	public String processAdd(@Valid @ModelAttribute("pageModel") OrganizationPersonnelModel opm, HttpServletRequest request,
 			Model model, HttpServletResponse response) throws IOException, ManagerException
 	{
-		opManager.add(opm);
+		opManager.add(opm,LoginHelper.getLoginUser(request));
 		model.addAttribute("model", opm);
 		addSuccess(response, "添加成功!");
 		addLog(request, LogType.USER_OPERATE, "用户（{}）添加测数据成功", LoginHelper.getLoginUser(request).getName());

src/web/cn/com/yskj/zfdm/web/zfdpatrol/ZfdPatrolController.java

@@ -26,6 +26,7 @@ import cn.com.yskj.zfdm.entity.dict.ZfdTaskStatus;
 import cn.com.yskj.zfdm.entity.dict.ZfdTaskType;
 import cn.com.yskj.zfdm.entity.zfd.ZfdPatrolTask;
 import cn.com.yskj.zfdm.manager.LoginHelper;
+import cn.com.yskj.zfdm.manager.vehicle.management.VehicleManagementManger;
 import cn.com.yskj.zfdm.manager.zfdpatrol.ZfdPatrolManager;
 import cn.com.yskj.zfdm.model.zfdpatrol.ZfdPatrolModel;
 import cn.com.yskj.zfdm.repo.request.zfdpatrol.ZfdPatrolPageRequest;
@@ -44,6 +45,8 @@ public class ZfdPatrolController extends BaseLogController {
 	private static final String prefix = "zfdpatrol/";
 	@Autowired
 	private ZfdPatrolManager zpManager;
+	@Autowired
+	private VehicleManagementManger vehicleManager;
 	
 	/**
 	 * 
@@ -54,6 +57,7 @@ public class ZfdPatrolController extends BaseLogController {
 	@RequestMapping(value = "/manage", method = RequestMethod.GET)
 	public String manageGet(@ModelAttribute("queryModel") ZfdPatrolPageRequest queryModel, Model model)
 	{
+		model.addAttribute("vehicles", vehicleManager.findAll());
 		
 		model.addAttribute("taskTypes",ZfdTaskType.values() );
 		model.addAttribute("taskStatuses",ZfdTaskStatus.values());

war/WEB-INF/jsp/zfdpatrol/manage.jsp

@@ -99,11 +99,17 @@ table.treetable tr.collapsed span.indenter a::before {
 									<form:input path="orgName" maxlength="100"
 										cssClass="form-control" placeholder="组织名称" />
 								</div>
-								<div class="form-group">
-									<form:input path="vehicleId" maxlength="100"
-										cssClass="form-control" placeholder="选择车辆" />
-								</div>
-								
+								<tr>
+									<th>车辆</th>
+									<td><select name="vehicleId" id="vehicleId"
+										class="form-control" style="margin: 5px -2px">
+											<option value="">请选择</option>
+											<c:forEach items="${vehicles}" var="v">
+												<option value="${v.vehicleId}">${v.vehiclePalte }_${v.vehiclePlatecolor }</option>
+											</c:forEach>
+									</select></td>
+								</tr>
+
 								<div class="form-group">
 
 									<div class="col-sm-10">
@@ -119,7 +125,7 @@ table.treetable tr.collapsed span.indenter a::before {
 										</div>
 									</div>
 								</div>
-								
+
 								<div class="form-group">
 									<form:label path="zfdTaskType">任务类型</form:label>
 									<form:select path="zfdTaskType" cssClass="form-control"