From 5452b71b68e30abed5bd66e3b3d246c7ff008ec0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 一月 2025 10:12:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 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 8fa9afa..ccef719 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"));
@@ -408,6 +412,30 @@
}
/**
+ * 门店登录使用
+ * @param username
+ * @return
+ */
+ @InnerAuth
+ @GetMapping("/infoShop/{username}")
+ public R<LoginUser> infoShop(@PathVariable("username") String username) {
+ SysUser sysUser = userService.selectUserByUserName(username);
+ if (StringUtils.isNull(sysUser)) {
+ return R.fail("用户名或密码错误");
+ }
+ // 角色集合
+ Set<String> roles = permissionService.getRolePermission(sysUser);
+ // 权限集合getRolePermission
+ Set<String> permissions = permissionService.getMenuPermission(sysUser);
+ LoginUser sysUserVo = new LoginUser();
+ sysUserVo.setSysUser(sysUser);
+ sysUserVo.setRoles(roles);
+ sysUserVo.setPermissions(permissions);
+
+ return R.ok(sysUserVo);
+ }
+
+ /**
* 注册用户信息
*/
@PostMapping("/register")
@@ -571,6 +599,8 @@
public R<SysUser> queryUserByUserName(@RequestBody String userName){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
.eq(SysUser::getUserName, userName)
+ .eq(SysUser::getDelFlag, "0")
+ .eq(SysUser::getStatus, 0)
.last("LIMIT 1"));
return R.ok(user);
}
@@ -696,4 +726,29 @@
Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
return R.ok(rolePerms);
}
+
+
+
+ /**
+ * 通过账号和账号权限查询用户
+ * @param userName
+ * @return
+ */
+ @PostMapping("/queryUserByUserNameAndRoleType")
+ 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")
+ .eq(SysUser::getStatus, 0)
+ .eq(SysUser::getRoleType, roleType)
+ .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