From ecca9ab70a9a87bcb60977c92fbf81053b8fc1bb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 04 九月 2024 09:17:55 +0800
Subject: [PATCH] 新增优化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MasterWorkerServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MasterWorkerServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MasterWorkerServiceImpl.java
index 516dacf..7e6f424 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MasterWorkerServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/MasterWorkerServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.admin.mapper.MasterWorkerMapper;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.vo.MasterWorkerRankVO;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.order.api.entity.WorkerOrderRankVO;
import com.ruoyi.order.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
@@ -34,7 +35,7 @@
if (null == cityList || cityList.isEmpty()) {
masterWorkerList = lambdaQuery().eq(MasterWorker::getIsDelete, 0).list();
} else {
- masterWorkerList = lambdaQuery().in(MasterWorker::getCity, cityList)
+ masterWorkerList = lambdaQuery().in(MasterWorker::getCityCode, cityList)
.eq(MasterWorker::getIsDelete, 0).list();
}
if (null == masterWorkerList || masterWorkerList.isEmpty()) {
@@ -72,7 +73,7 @@
@Override
public boolean checkOnlyPhone(String phone, Integer id) {
- LambdaQueryChainWrapper<MasterWorker> wrapper = lambdaQuery().eq(MasterWorker::getPhone, phone);
+ LambdaQueryChainWrapper<MasterWorker> wrapper = lambdaQuery().eq(MasterWorker::getPhone, phone).eq(BaseEntity::getIsDelete, 0);
if (null != id) {
wrapper.ne(MasterWorker::getId, id);
}
--
Gitblit v1.7.1