修改接口bug

Pu Zhibing

2025-04-07 4109495b9c51a4bbd8b0a7c3c69093909d2e33e1

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -149,17 +149,6 @@
      ajax.put("posts", postService.selectPostAll());
      if (StringUtils.isNotNull(userId)) {
         SysUser sysUser = userService.selectUserById(userId);
         if (sysUser.getRoleType() == 2) {
            Long userid = tokenService.getLoginUser().getUserid();
            SysUser sysUser1 = userService.selectUserById(userid);
            UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, sysUser.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
            sysUser.setDeptId(one.getDeptId());
            sysUser.setNickName(one.getNickName());
            SysDept sysDept = deptService.selectDeptById(one.getDeptId());
            sysUser.setDept(sysDept);
            sysUser.setRoleId(one.getRoleId());
         }
			
         ajax.put("data", sysUser);
         ajax.put("postIds", postService.selectPostListByUserId(userId));
         ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
@@ -528,9 +517,6 @@
      }
      user.setCreateBy(SecurityUtils.getUsername());
      user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
      if (null == user.getRoleType()) {
         user.setRoleType(1);
      }
      userService.insertUser(user);
      SysUserRole sysUserRole = new SysUserRole();
      sysUserRole.setRoleId(user.getRoleId());
@@ -567,7 +553,7 @@
   @PostMapping("/saveShopUser")
   public R<Long> saveShopUser(@RequestBody SysUser user) {
      SysUser one = userService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, user.getPhonenumber()).eq(SysUser::getDelFlag, "0")
            .eq(SysUser::getStatus, "0").eq(SysUser::getRoleType, 2));
            .eq(SysUser::getStatus, "0"));
      if (null == one) {
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         userService.save(user);
@@ -614,25 +600,6 @@
   }
   
   
   @ResponseBody
   @PutMapping("/switchShop/{shopId}")
   @ApiOperation(value = "切换门店", tags = {"门店后台-首页"})
   public R<Set<String>> switchShop(@PathVariable("shopId") Integer shopId) {
      Long userid = tokenService.getLoginUser().getUserid();
      UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, userid).eq(UserShop::getShopId, shopId));
      if (null == one) {
         return R.fail("切换失败");
      }
      SysUser sysUser = userService.getById(userid);
      sysUser.setObjectId(shopId);
      userService.updateById(sysUser);
      //查询用户权限列表
      Long roleId = one.getRoleId();
      Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
      return R.ok(rolePerms);
   }
	
	
   /**
    * 通过账号和账号权限查询用户
    *
@@ -645,7 +612,6 @@
            .eq(SysUser::getUserName, userName)
            .eq(SysUser::getDelFlag, "0")
            .eq(SysUser::getStatus, 0)
            .eq(SysUser::getRoleType, roleType)
            .last("LIMIT 1"));
      return R.ok(user);
   }