Antiloveg 8 gadi atpakaļ
vecāks
revīzija
aeffd08ca1

+ 7 - 6
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -1,7 +1,6 @@
 package com.goafanti.admin.controller;
 
 import java.util.Arrays;
-import java.util.List;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -54,6 +53,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		res.setData(userService.selectDemandUserNames());
 		return res;
 	}
+	
 
 	/**
 	 * 组织用户详情
@@ -112,9 +112,9 @@ public class AdminDemandApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 个人用户新增需求
+	 * 新增需求
 	 */
-	@RequestMapping(value = "/userApply", method = RequestMethod.POST)
+	@RequestMapping(value = "/apply", method = RequestMethod.POST)
 	public Result userApply(@Valid InputDemand demand, BindingResult bindingResult,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
@@ -135,9 +135,9 @@ public class AdminDemandApiController extends CertifyApiController {
 	}
 
 	/**
-	 * 修改个人用户需求
+	 * 修改需求
 	 */
-	@RequestMapping(value = "/userUpdate", method = RequestMethod.POST)
+	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult,
 			String validityPeriodFormattedDate) {
 		Result res = new Result();
@@ -251,7 +251,8 @@ public class AdminDemandApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!DemandDataCategory.USERDEMAND.getCode().equals(demand.getDataCategory())) {
+		if (!DemandDataCategory.USERDEMAND.getCode().equals(demand.getDataCategory())
+				&& !DemandDataCategory.ORGDEMAND.getCode().equals(demand.getDataCategory())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "数据类型"));
 			return res;
 		}