修改文档上的bug

Pu Zhibing

2025-04-10 eaa4e5993195fc8f01daacfc827f7f350f28962e

修改文档上的bug

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

@@ -130,6 +130,8 @@
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
        }
        user.setRoleType(sysUser1.getRoleType());
        user.setObjectId(sysUser1.getObjectId());
        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
            return error("手机号已开通账号");
        }
@@ -214,8 +216,12 @@
    @GetMapping("/verifyUserNameRepeat/{username}")
    @ApiOperation(value = "校验账号是否重复", tags = {"管理后台-账号管理"})
    public AjaxResult verifyUserNameRepeat(@PathVariable String username){
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser1 = userService.getById(userid);
        SysUser user = new SysUser();
        user.setUserName(username);
        user.setRoleType(sysUser1.getRoleType());
        user.setObjectId(sysUser1.getObjectId());
        if (StringUtils.isNotEmpty(username) && !userService.checkUserNameUnique(user)) {
            return error("账号不可重复");
        }
@@ -266,21 +272,18 @@
    @PutMapping("/update")
    @ApiOperation(value = "编辑系统用户", tags = {"管理后台-账号管理", "门店后台-部门管理"})
    public AjaxResult edit(@Validated @RequestBody SysUser user) {
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser1 = userService.getById(userid);
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
        }
        R<Integer> admin = this.isAdmin(user.getUserId());
        Integer data = admin.getData();
        if(data == null || data != 1){
            SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
            one.setRoleId(user.getRoleId());
            sysUserRoleService.updateSysUserRole(one);
        }
        userService.checkUserAllowed(user);
        userService.checkUserDataScope(user.getUserId());
        SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getPhonenumber, user.getPhonenumber())
                        .eq(SysUser::getRoleType, sysUser1.getRoleType())
                        .eq(SysUser::getObjectId, sysUser1.getObjectId())
                .eq(SysUser::getDelFlag,0)
                .last("LIMIT 1"));

@@ -289,6 +292,8 @@
        }
        sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
                .eq(SysUser::getUserName, user.getUserName())
                .eq(SysUser::getRoleType, sysUser1.getRoleType())
                .eq(SysUser::getObjectId, sysUser1.getObjectId())
                .eq(SysUser::getDelFlag,0)
                .last("LIMIT 1"));
        if (StringUtils.isNotEmpty(user.getUserName()) && (Objects.nonNull(sysUser) && !user.getUserId().equals(sysUser.getUserId()) )) {
@@ -307,10 +312,18 @@
        user.setUpdateBy(SecurityUtils.getUsername());
        user.setUpdateTime(new Date());
        userService.updateUser(user);
    
        //修改角色数据
        SysUserRole userRole = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getUserId()));
        userRole.setRoleId(user.getRoleId());
        sysUserRoleService.updateSysUserRole(userRole);
        
        //修改角色数据
        user = userService.getById(user.getUserId());
        //添加门店员工关系数据
        if(2 == user.getRoleType()){
            UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId()).eq(UserShop::getShopId, user.getObjectId()));
            UserShop one = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, user.getUserId())
                    .eq(UserShop::getShopId, user.getObjectId()));
            one.setUserId(user.getUserId());
            one.setShopId(user.getObjectId());
            one.setRoleType(one.getRoleType());

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -114,17 +114,17 @@
     * 
     * @return 结果
     */
    SysUser checkUserNameUnique(SysUser user);
    SysUser checkUserNameUnique(@Param("sysUser") SysUser user);


    SysUser checkNickNameUnique(SysUser sysUser);
    SysUser checkNickNameUnique(@Param("sysUser") SysUser sysUser);

    /**
     * 校验手机号码是否唯一
     *
     * @return 结果
     */
    SysUser checkPhoneUnique(SysUser sysUser);
    SysUser checkPhoneUnique(@Param("sysUser") SysUser sysUser);
    
    


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -203,7 +203,6 @@
    @Override
    public boolean checkNickNameUnique(SysUser user) {
        SysUser info = userMapper.checkNickNameUnique(user);
        System.err.println("aaaaa:"+(JSON.toJSONString(info)));
        if (StringUtils.isNotNull(info) ) {
            return UserConstants.NOT_UNIQUE;
        }

 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -53,13 +53,13 @@
        server-addr: 127.0.0.1:8848
        service: ${spring.application.name}
        group: DEFAULT_GROUP
        namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
        namespace: 20c168da-8cf1-4fff-bc38-bc62df656b6a
        username: nacos
        password: nacos
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
        namespace: cdf47c5f-2bf9-4dec-a616-a8dc653aceb9
        namespace: 20c168da-8cf1-4fff-bc38-bc62df656b6a
        username: nacos
        password: nacos
        group: DEFAULT_GROUP

 ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml

@@ -119,17 +119,23 @@
    </select>
    
    <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
        select user_id, user_name from sys_user where user_name = #{userName}
        <if test="null != objectId">
            and objectId = #{objectId}
        select user_id, user_name from sys_user where user_name = #{sysUser.userName}
        <if test="null != sysUser.objectId">
            and objectId = #{sysUser.objectId}
        </if>
        <if test="null != sysUser.roleType">
            and role_type = #{sysUser.roleType}
        </if>
        and del_flag = '0' limit 1
    </select>
    
    <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
        select user_id, phonenumber from sys_user where phonenumber = #{phonenumber}
        <if test="null != objectId">
            and objectId = #{objectId}
        select user_id, phonenumber from sys_user where phonenumber = #{sysUser.phonenumber}
        <if test="null != sysUser.objectId">
            and objectId = #{sysUser.objectId}
        </if>
        <if test="null != sysUser.roleType">
            and role_type = #{sysUser.roleType}
        </if>
        and del_flag = '0' limit 1
    </select>
@@ -197,7 +203,13 @@
        ORDER BY create_time DESC
    </select>
    <select id="checkNickNameUnique" resultMap="SysUserResult">
        select user_id, user_name from sys_user where nick_name = #{nickName}
        select user_id, user_name from sys_user where nick_name = #{sysUser.nickName}
        <if test="null != sysUser.objectId">
            and objectId = #{sysUser.objectId}
        </if>
        <if test="null != sysUser.roleType">
            and role_type = #{sysUser.roleType}
        </if>
        and del_flag = '0' limit 1
    </select>