From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
index 7e04012..580d976 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.Evaluate;
import com.ruoyi.order.api.feignClient.EvaluateClient;
@@ -53,6 +54,7 @@
/**
* 师傅列表分页查询 (添加订单-选择师傅列表)
*/
+ @RequiresPermissions("master_worker_list")
@ApiOperation(value = "师傅列表", tags = {"后台-师傅管理"})
@GetMapping(value = "/selectServe")
@ApiImplicitParams({
@@ -85,9 +87,9 @@
// 最后一跳城市不匹配or条件
String s = cityList.get(i);
if (cityList.size() - 1 == i) {
- wrapper.like(MasterWorker::getCity, s);
+ wrapper.like(MasterWorker::getCityCode, s);
} else {
- wrapper.like(MasterWorker::getCity, s).or();
+ wrapper.like(MasterWorker::getCityCode, s).or();
}
}
return R.ok(wrapper.eq(MasterWorker::getIsDelete, Constants.ZERO)
@@ -99,6 +101,7 @@
*
* @param masterWorker 师傅详细信息
*/
+ @RequiresPermissions("worker_save")
@ApiOperation(value = "新增师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody MasterWorker masterWorker) {
@@ -119,6 +122,7 @@
*
* @param ids 账号id拼接
*/
+ @RequiresPermissions("worker_delete")
@ApiOperation(value = "删除师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -136,6 +140,7 @@
*
* @param masterWorker 师傅信息
*/
+ @RequiresPermissions("worker_update")
@ApiOperation(value = "修改师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody @Validated MasterWorker masterWorker) {
@@ -153,6 +158,7 @@
* @param id 师傅信息id
* @param enable 启用/关闭
*/
+ @RequiresPermissions("worker_enable")
@ApiOperation(value = "启用/关闭师傅账号", tags = {"后台-师傅管理-师傅列表管理"})
@GetMapping(value = "/enable")
@ApiImplicitParams({
@@ -170,6 +176,7 @@
*
* @param workerId 师傅id
*/
+ @RequiresPermissions("worker_detail")
@ApiOperation(value = "师傅详细信息", tags = {"后台-师傅管理-师傅列表管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
--
Gitblit v1.7.1