From 73099d152c5d2e725bd7b108ed2e0b76d22e1590 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 20:39:07 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 5896371..8fa9afa 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -134,13 +134,13 @@
}
//门店员工添加数据，需要判断账号是否存在，共用同一个账号
if(2 == sysUser1.getRoleType()){
+ AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
+ if(null == appUser){
+ return error("请先注册小程序账号");
+ }
SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, user.getPhonenumber())
.eq(SysUser::getDelFlag, "0").eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2));
if(null == one){
- AppUser appUser = appUserClient.getAppUserByPhone1(user.getPhonenumber()).getData();
- if(null == appUser){
- return error("请先注册小程序账号");
- }
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword("a123456"));
user.setRoleType(sysUser1.getRoleType());
@@ -154,8 +154,13 @@
sysUserRole.setRoleId(user.getRoleId());
sysUserRole.setUserId(user.getUserId());
userRoleService.insertSysUserRole(sysUserRole);
- //添加小程序店员关系数据
- if(null != appUser){
+
+ }
+ //添加小程序店员关系数据
+ if(null != appUser){
+ List<AppUserShop> data = appUserShopClient.getAppUserShop(appUser.getId()).getData();
+ Optional<AppUserShop> first = data.stream().filter(s -> s.getShopId().equals(sysUser1.getObjectId())).findFirst();
+ if(!first.isPresent()){
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(sysUser1.getObjectId());
@@ -164,6 +169,7 @@
appUserClient.editAppUserById(appUser);
}
}
+
//添加门店员工关系数据
UserShop userShop = new UserShop();
userShop.setUserId(one.getUserId());
--
Gitblit v1.7.1