修改

xuhy

3 天以前 508f3e225df87e0da974424981e7782fc5ce875c

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

@@ -7,6 +7,7 @@
import javax.validation.Validator;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.TShopDTO;
import com.ruoyi.system.query.SysUserQuery;
import com.ruoyi.system.vo.SysUserVO;
import org.slf4j.Logger;
@@ -294,7 +295,7 @@
    {
        Long userId = user.getUserId();
        // 删除用户与角色关联
//        userRoleMapper.deleteUserRoleByUserId(userId);
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 新增用户与角色管理
        insertUserRoleId(user);
        // 删除用户与岗位关联
@@ -475,8 +476,6 @@
    {
        // 删除用户与角色关联
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 删除用户与岗位表
        userPostMapper.deleteUserPostByUserId(userId);
        return userMapper.deleteUserById(userId);
    }

@@ -615,11 +614,6 @@
    }

    @Override
    public int updateUserIfBlack(List<Long> ids) {
        return userMapper.updateUserIfBlack(ids);
    }

    @Override
    public List<SysUser> selectAllList() {
        return userMapper.selectAllList();
    }
@@ -642,6 +636,47 @@
        return userMapper.selectIdByPhone(phonenumber);
    }

    @Override
    public Long addAccount(TShopDTO dto) {
        SysUser sysUser = new SysUser();
        sysUser.setUserName(dto.getAccount());
        sysUser.setPhonenumber(dto.getAccount());
        sysUser.setNickName(dto.getShopHead());
        sysUser.setObjectId(dto.getId());
        if(dto.getShopType().equals(1)){
            sysUser.setRoleType(2);
            sysUser.setRoleId(9L);
        }else {
            sysUser.setRoleType(3);
            sysUser.setRoleId(2L);
        }
        sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        sysUser.setRePassword(SecurityUtils.encryptPassword("123456"));
        this.insertUser(sysUser);
        return sysUser.getUserId();
    }

    @Override
    public void updateAccount(TShopDTO dto) {
//        SysUser sysUser = this.selectUserByUserName(dto.getAccount());
        SysUser sysUser = this.selectUserById(dto.getUserId());
        if(Objects.isNull(sysUser)){
            throw new ServiceException("未查询到该账号");
        }
        sysUser.setUserName(dto.getAccount());
        sysUser.setNickName(dto.getShopHead());
        if(dto.getShopType() ==1){
            sysUser.setRoleType(2);
        }else {
            sysUser.setRoleType(3);
        }
        if(Objects.nonNull(dto.getPassword())){
            sysUser.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
        }
        sysUser.setStatus(dto.getAccountStatus());
        this.updateUser(sysUser);
    }

//    @Override
//    public UserInfoVo userInfo(Long userId) {
//        return userMapper.userInfo(userId);