新增日志

wujianwei

2025-12-23 9f41c41fc1c60e572c137cd93a6b45b0e05f34e2

 admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -3,6 +3,8 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.common.utils.Sm4Utils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -138,6 +140,13 @@
        {
            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        if (user.getIsDriver() == 0  && !userService.checkDriverUnique(user)){
            return error("新增用户'" + user.getUserName() + "'失败，驾驶员已绑定其他账户");

        }else{
            user.setDriverId(null);
        }

        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        return toAjax(userService.insertUser(user));
@@ -167,6 +176,11 @@
        {
            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        if (user.getIsDriver() == 0  && !userService.checkDriverUnique(user)){
            return error("新增用户'" + user.getUserName() + "'失败，驾驶员已绑定其他账户");

        }

        user.setUpdateBy(getUsername());
        return toAjax(userService.updateUser(user));
    }
@@ -196,6 +210,7 @@
    {
        userService.checkUserAllowed(user);
        userService.checkUserDataScope(user.getUserId());
        user.setPassword(Sm4Utils.decryptSm4(user.getPassword())) ;
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        user.setUpdateBy(getUsername());
        return toAjax(userService.resetPwd(user));