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 | 67 ++++++++++++++++++++++++++------- 1 files changed, 52 insertions(+), 15 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..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 @@ -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,26 +154,36 @@ 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()); + appUserShop.setRoleType(2); appUserShopClient.saveAppUserShop(appUserShop); appUser.setUserType(2); appUserClient.editAppUserById(appUser); } } + //添加门店员工关系数据 - 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")); @@ -565,6 +575,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); } @@ -690,4 +702,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