From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 09:34:49 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
index 050ff5c..2edf241 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -89,7 +89,6 @@
if (Constants.ZERO.equals(process.getState())) {
return R.fail("入驻申请暂未审核通过，请耐心等待！");
} else if (Constants.TWO.equals(process.getState())) {
-// return R.fail("入驻申请已驳回，请重新提交入驻申请！");
return R.fail("当前手机号未注册！");
} else {
return R.registered("当前账号未提交入驻申请，无法登录！");
@@ -185,7 +184,6 @@
if (Constants.ZERO.equals(process.getState())) {
return R.fail("入驻申请暂未审核通过，请耐心等待！");
} else if (Constants.TWO.equals(process.getState())) {
-// return R.fail("入驻申请已驳回，请重新提交入驻申请！");
return R.fail("当前手机号未注册！");
} else {
return R.registered("当前账号未提交入驻申请，无法登录！");
@@ -364,6 +362,14 @@
return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));
}
+ @ApiOperation(value = "下拉框", tags = {"后台-下拉框"})
+ @GetMapping(value = "/workSelect")
+ public R<List<MasterWorker>> workSelect() {
+
+ List<MasterWorker> list = masterWorkerService.lambdaQuery().eq(MasterWorker::getIsEnable, 1).eq(MasterWorker::getIsDelete, 0).list();
+ return R.ok(list);
+ }
+
/**
* 师傅端-订单列表-地图模式
*/
--
Gitblit v1.7.1