From 2bc35df79fca920ad584a82b5ea7b35b6ca7b8a0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 10:12:57 +0800
Subject: [PATCH] 12.18
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 2f17c3a..daa57b8 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
@@ -164,6 +164,7 @@
AppUserShop appUserShop = new AppUserShop();
appUserShop.setAppUserId(appUser.getId());
appUserShop.setShopId(sysUser1.getObjectId());
+ appUserShop.setRoleType(2);
appUserShopClient.saveAppUserShop(appUserShop);
appUser.setUserType(2);
appUserClient.editAppUserById(appUser);
@@ -171,15 +172,18 @@
}
//添加门店员工关系数据
- UserShop userShop = new UserShop();
- userShop.setUserId(one.getUserId());
- userShop.setShopId(sysUser1.getObjectId());
- userShop.setRoleType(2);
- userShop.setRoleId(user.getRoleId());
- userShop.setDeptId(user.getDeptId());
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopService.save(userShop);
+ UserShop one1 = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, one.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
+ if(null == one1){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(one.getUserId());
+ userShop.setShopId(sysUser1.getObjectId());
+ userShop.setRoleType(2);
+ userShop.setRoleId(user.getRoleId());
+ userShop.setDeptId(user.getDeptId());
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopService.save(userShop);
+ }
}else{
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword("a123456"));
@@ -707,7 +711,7 @@
* @return
*/
@PostMapping("/queryUserByUserNameAndRoleType")
- public R<SysUser> queryUserByUserNameAndRoleType(@RequestParam("roleType") String userName, @RequestParam("roleType") Integer roleType){
+ public R<SysUser> queryUserByUserNameAndRoleType(@RequestParam("userName") String userName, @RequestParam("roleType") Integer roleType){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getUserName, userName)
.eq(SysUser::getDelFlag, "0")
@@ -716,4 +720,11 @@
.last("LIMIT 1"));
return R.ok(user);
}
+
+
+ @PostMapping("/delSysUserById")
+ public R delSysUserById(@RequestParam("userId") Long userId){
+ userService.deleteUserById(userId);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1