wks 1 жил өмнө
parent
commit
7777877c97

+ 4 - 4
src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
@@ -25,7 +26,6 @@ public class OrderQueryVo {
     private String orderNo;
 
 
-
     @ApiModelProperty(value = "订单状态")
     private String orderStatus;
 
@@ -45,9 +45,9 @@ public class OrderQueryVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate endDate;
 
-    @ApiModelProperty(value = "每页数")
-    //@Min(value = 20, message = "页数最小为20")
-    //@Max(value = 100, message = "页数最大为100")
+    @ApiModelProperty(value = "每页数据大小")
+    @Min(value = 20, message = "页数最小为20")
+    @Max(value = 100, message = "页数最大为100")
     private int pageSize;
 
     @ApiModelProperty(value = "页数")

+ 2 - 1
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -673,7 +673,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         boolean adminFalg = false;
         //修改逻辑   add by  hxl   修改查询当前登陆人的订单   admin 可以查看所有
-        if ("admin".equals(orderQueryVo.getUserId())) {
+        String userId = BaseController.getUserId();
+        if ("admin".equals(userId)) {
             adminFalg = true;
         }
         /**