From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
index b4008a1..f35bcdc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java
@@ -621,7 +621,7 @@
}
Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
- if (countOrder != null && countOrder > 10) {
+ if (countOrder != null && countOrder >= 10) {
if (StringUtil.isNullOrEmpty(mark)) {
mark = "鍒峰崟棰勮锛侊紒";
} else {
@@ -699,7 +699,7 @@
}
Integer countOrder = commonOrderCountService.countOderByUidAndLess10(extract.getUserInfo().getId());
- if (countOrder != null && countOrder > 10) {
+ if (countOrder != null && countOrder >= 10) {
if (StringUtil.isNullOrEmpty(mark)) {
mark = "鍒峰崟棰勮锛侊紒";
} else {
--
Gitblit v1.8.0