Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderViolationController.java

@@ -3,7 +3,6 @@ package com.xxfc.platform.order.rest;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
@@ -74,17 +73,12 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
 	 * @return
 	 */
 	@GetMapping("/getOne/{detailId}")
-	public ObjectRestResponse<OrderViolation> getOne(@PathVariable Integer detailId) {
+	public ObjectRestResponse<List<OrderViolation>> getOne(@PathVariable Integer detailId) {
 		Example exa = Example.builder(OrderViolation.class)
 				.where(WeekendSqls.<OrderViolation>custom().andEqualTo(OrderViolation::getDetailId, detailId)
 						.andEqualTo(OrderViolation::getIsDel, 0)).build();
 		List<OrderViolation> orderViolations = getBaseBiz().selectByExample(exa);
-		if (orderViolations.size() > 1) {
-			throw new BaseException("The database has multiple records");
-		}
-		OrderViolation orderViolation = new OrderViolation();
-		orderViolation = (orderViolations.size() == 0) ? null : orderViolations.get(0);
-		return ObjectRestResponse.succ(orderViolation);
+		return ObjectRestResponse.succ(orderViolations);
 	}