11.6

无关风月

2025-04-22 67f416634f95c81e618123b826e18a57ae08220d

 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);
        }