Antiloveg hace 8 años
padre
commit
f791308b9e

+ 11 - 13
src/main/java/com/goafanti/achievement/controller/AchievementApiController.java

@@ -37,19 +37,17 @@ import com.goafanti.core.shiro.token.TokenManager;
 @RequestMapping(value = "/api/user/achievement")
 public class AchievementApiController extends CertifyApiController {
 	@Resource
-	private AchievementService	achievementService;
+	private AchievementService		achievementService;
 	@Resource
-	private AftFileService		aftFileService;
+	private AftFileService			aftFileService;
 	@Resource
-	private AchievementOrderService achievementOrderService;
-	
-	
-	
+	private AchievementOrderService	achievementOrderService;
+
 	/**
 	 * 成果需求匹配列表
 	 */
 	@RequestMapping(value = "/achievementDemand", method = RequestMethod.GET)
-	public Result achievementDemand(String id){
+	public Result achievementDemand(String id) {
 		Result res = new Result();
 		res.setData(achievementService.selectAchievementDemandListByAchievementId(id));
 		return res;
@@ -162,7 +160,7 @@ public class AchievementApiController extends CertifyApiController {
 		res.setData(achievementService.selectUserOwnerDetail(id));
 		return res;
 	}
-	
+
 	/**
 	 * 组织用户成果详情详情
 	 */
@@ -294,16 +292,16 @@ public class AchievementApiController extends CertifyApiController {
 	@RequestMapping(value = "/delete", method = RequestMethod.POST)
 	private Result delete(@RequestParam(name = "ids[]", required = false) String[] ids) {
 		Result res = new Result();
-		if (ids == null || ids.length == 1) {
+		if (ids == null || ids.length < 1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
+		} else {
 			List<AchievementOrder> list = achievementOrderService.selectAchievementOrderByAchievementId(ids[0]);
-			for (AchievementOrder order : list){
-				if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())){
+			for (AchievementOrder order : list) {
+				if (!AchievementOrderStatus.CREATE.getCode().equals(order.getStatus())) {
 					res.getError().add(buildError("", "当前科技成果有订单,无法删除!"));
 					return res;
 				}
 			}
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", ""));
-		} else {
 			res.setData(achievementService.deleteByPrimaryKey(Arrays.asList(ids)));
 		}
 		return res;