Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-25 b5a9dccccaf5bed064891a05ec8ff3f21de9cff0

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java

@@ -7,6 +7,7 @@
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.entity.userInfo.User;
import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
@@ -15,6 +16,7 @@
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Collections;
import java.util.HashMap;
@@ -80,10 +82,58 @@
        return returnUser;
    }

    @Transactional
    public Boolean updatePassWord(Map<String,Object> object) {
        boolean saveState = false;
        int userId =0;
        String oldPassWord = "";
        String passWord = "";
        if (object.get("userId") != null) {
            userId = Integer.parseInt(object.get("userId").toString());
        }
        if (object.get("oldPassword") != null) {
            oldPassWord = object.get("oldPassword").toString();
        }
        if (object.get("password") != null) {
            passWord = object.get("password").toString();
        }

        User user =userMapper.findOnePassWord(userId,oldPassWord);
        if (user!=null){
            if (userMapper.updatePassWordById(userId,passWord)){
                saveState = true;
            }
        }
        return saveState;

    }

    @Transactional
    public Boolean updateUserName(Map<String,Object> object) {
        boolean saveState = false;
        int userId =0;
        String userName = "";
        if (object.get("userId") != null) {
            userId = Integer.parseInt(object.get("userId").toString());
        }
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }

        if (userMapper.updateUserNameById(userId,userName)){
            saveState = true;
        }
        return saveState;

    }

    /*----------------新版本登陆*/
    public UserDTO doLogin(UserDTO userDTO) {
        User user = userMapper.selectOne(new QueryWrapper<User>().
                eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
                eq("login_name", userDTO.getUserId())
                .eq("password", userDTO.getPass())
                .eq("state",1)
        );
        if(user!=null){
            //检查是让有登录，有登录直接退出
            StpUtil.logout(user.getId());
@@ -92,6 +142,7 @@
            userDTO.setPass(null);
            userDTO.setId(user.getId());
            userDTO.setUserName(user.getUserName());
            userDTO.setAddress(user.getAddress());
            userDTO.setToken(StpUtil.getTokenValue());
            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));