修改
This commit is contained in:
@@ -19,6 +19,8 @@ import org.springframework.stereotype.Component;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -292,7 +294,6 @@ public class PrintMechineConsumer {
|
||||
|
||||
log.info("获取当前类别是否未打印类别:{}", count);
|
||||
if (count > 0) {
|
||||
|
||||
// 统计已打数量
|
||||
int printerNum = 0;
|
||||
boolean isReturn = false;
|
||||
|
||||
@@ -88,6 +88,10 @@ public class MemberService {
|
||||
public Result queryMember(String shopId, String phone,String isFlag, int page, int pageSize) {
|
||||
|
||||
PageHelperUtil.startPage(page, pageSize);
|
||||
|
||||
if(!"1".equals(isFlag)){
|
||||
isFlag=null;
|
||||
}
|
||||
List<TbShopUser> tbShopUsers = tbShopUserMapper.selectByShopId(shopId, phone,isFlag);
|
||||
PageInfo pageInfo = new PageInfo(tbShopUsers);
|
||||
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
||||
|
||||
Reference in New Issue
Block a user