From 57833f5b8677f8d882c45ef6a346f3901ff6df4c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 12:21:22 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
index cfe3d51..cac368d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -70,10 +70,11 @@
@GetMapping("/manage/list")
@ApiOperation(value = "技师列表", tags = {"门店-技师列表"})
public R<Page<Technician>> managelist(@RequestParam Integer pageNum,@RequestParam Integer pageSize,@ApiParam("技师姓名") String name,@ApiParam("技师电话") String phone) {
- Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
+ Long userid = tokenService.getLoginUser().getSysUser().getUserId();
+ SysUser sysUser = sysUserClient.getSysUser(userid).getData();
Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
.like(phone != null, Technician::getPhone, phone)
- .eq(Technician::getShopId, objectId)
+ .eq(Technician::getShopId, sysUser.getObjectId())
.page(Page.of(pageNum, pageSize));
return R.ok(page);
}
@@ -99,7 +100,8 @@
if (appUser ==null){
return R.fail("当前号码暂无注册用户");
}
-
+ appUser.setUserType(2);
+ appUserClient.editAppUserById(appUser);
AppUserShop appUserShop = new AppUserShop();
appUserShop.setShopId(sysUser.getObjectId());
appUserShop.setAppUserId(appUser.getId());
@@ -108,7 +110,9 @@
}else {
Technician byId = technicianService.getById(technician.getId());
if (byId.getPhone()!=technician.getPhone()){
- List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
+ List<Technician> list = technicianService.lambdaQuery()
+ .eq(Technician::getPhone, technician.getPhone())
+ .ne(Technician::getId, byId.getId()).list();
if (!list.isEmpty()) {
return R.fail("当前号码已经添加");
}
--
Gitblit v1.7.1