优化异常信息

RuoYi

2021-08-16 1e4ed04a65e41ca1e36fd8170e530da2a65ab69c

优化异常信息

 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -7,7 +7,7 @@
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.UserStatus;
import com.ruoyi.common.core.exception.BaseException;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.SecurityUtils;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -41,51 +41,51 @@
        if (StringUtils.isAnyBlank(username, password))
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写");
            throw new BaseException("用户/密码必须填写");
            throw new ServiceException("用户/密码必须填写");
        }
        // 密码如果不在指定范围内 错误
        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码不在指定范围");
            throw new BaseException("用户密码不在指定范围");
            throw new ServiceException("用户密码不在指定范围");
        }
        // 用户名不在指定范围内 错误
        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "用户名不在指定范围");
            throw new BaseException("用户名不在指定范围");
            throw new ServiceException("用户名不在指定范围");
        }
        // 查询用户信息
        R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);

        if (R.FAIL == userResult.getCode())
        {
            throw new BaseException(userResult.getMsg());
            throw new ServiceException(userResult.getMsg());
        }

        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
            throw new BaseException("登录用户：" + username + " 不存在");
            throw new ServiceException("登录用户：" + username + " 不存在");
        }
        LoginUser userInfo = userResult.getData();
        SysUser user = userResult.getData().getSysUser();
        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
            throw new BaseException("对不起，您的账号：" + username + " 已被删除");
            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
        }
        if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
            throw new BaseException("对不起，您的账号：" + username + " 已停用");
            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
        }
        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
        {
            recordLogininfor(username, Constants.LOGIN_FAIL, "用户密码错误");
            throw new BaseException("用户不存在/密码错误");
            throw new ServiceException("用户不存在/密码错误");
        }
        recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功");
        return userInfo;
@@ -104,17 +104,17 @@
        // 用户名或密码为空 错误
        if (StringUtils.isAnyBlank(username, password))
        {
            throw new BaseException("用户/密码必须填写");
            throw new ServiceException("用户/密码必须填写");
        }
        if (username.length() < UserConstants.USERNAME_MIN_LENGTH
                || username.length() > UserConstants.USERNAME_MAX_LENGTH)
        {
            throw new BaseException("账户长度必须在2到20个字符之间");
            throw new ServiceException("账户长度必须在2到20个字符之间");
        }
        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)
        {
            throw new BaseException("密码长度必须在5到20个字符之间");
            throw new ServiceException("密码长度必须在5到20个字符之间");
        }

        // 注册用户信息
@@ -126,7 +126,7 @@

        if (R.FAIL == registerResult.getCode())
        {
            throw new BaseException(registerResult.getMsg());
            throw new ServiceException(registerResult.getMsg());
        }
        recordLogininfor(username, Constants.REGISTER, "注册成功");
    }

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CustomException.java

File was deleted

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java

New file
@@ -0,0 +1,58 @@
package com.ruoyi.common.core.exception;

/**
 * 全局异常
 * 
 * @author ruoyi
 */
public class GlobalException extends RuntimeException
{

    private static final long serialVersionUID = 1L;

    /**
     * 错误提示
     */
    private String message;

    /**
     * 错误明细，内部调试错误
     *
     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
     */
    private String detailMessage;

    /**
     * 空构造方法，避免反序列化问题
     */
    public GlobalException()
    {
    }

    public GlobalException(String message)
    {
        this.message = message;
    }

    public String getDetailMessage()
    {
        return detailMessage;
    }

    public GlobalException setDetailMessage(String detailMessage)
    {
        this.detailMessage = detailMessage;
        return this;
    }

    public String getMessage()
    {
        return message;
    }

    public GlobalException setMessage(String message)
    {
        this.message = message;
        return this;
    }
}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java

New file
@@ -0,0 +1,73 @@
package com.ruoyi.common.core.exception;

/**
 * 业务异常
 * 
 * @author ruoyi
 */
public final class ServiceException extends RuntimeException
{
    private static final long serialVersionUID = 1L;

    /**
     * 错误码
     */
    private Integer code;

    /**
     * 错误提示
     */
    private String message;

    /**
     * 错误明细，内部调试错误
     *
     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
     */
    private String detailMessage;

    /**
     * 空构造方法，避免反序列化问题
     */
    public ServiceException()
    {
    }

    public ServiceException(String message)
    {
        this.message = message;
    }

    public ServiceException(String message, Integer code)
    {
        this.message = message;
        this.code = code;
    }

    public String getDetailMessage()
    {
        return detailMessage;
    }

    public String getMessage()
    {
        return message;
    }

    public Integer getCode()
    {
        return code;
    }

    public ServiceException setMessage(String message)
    {
        this.message = message;
        return this;
    }

    public ServiceException setDetailMessage(String detailMessage)
    {
        this.detailMessage = detailMessage;
        return this;
    }
}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java

File was renamed from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/BaseException.java
@@ -1,79 +1,79 @@
package com.ruoyi.common.core.exception;



/**

 * 基础异常

 * 
 * @author ruoyi

 */

public class BaseException extends RuntimeException

{

    private static final long serialVersionUID = 1L;



    /**

     * 所属模块

     */

    private String module;



    /**

     * 错误码

     */

    private String code;



    /**

     * 错误码对应的参数

     */

    private Object[] args;



    /**

     * 错误消息

     */

    private String defaultMessage;



    public BaseException(String module, String code, Object[] args, String defaultMessage)

    {

        this.module = module;

        this.code = code;

        this.args = args;

        this.defaultMessage = defaultMessage;

    }



    public BaseException(String module, String code, Object[] args)

    {

        this(module, code, args, null);

    }



    public BaseException(String module, String defaultMessage)

    {

        this(module, null, null, defaultMessage);

    }



    public BaseException(String code, Object[] args)

    {

        this(null, code, args, null);

    }



    public BaseException(String defaultMessage)

    {

        this(null, null, null, defaultMessage);

    }



    public String getModule()

    {

        return module;

    }



    public String getCode()

    {

        return code;

    }



    public Object[] getArgs()

    {

        return args;

    }



    public String getDefaultMessage()

    {

        return defaultMessage;

    }

}

package com.ruoyi.common.core.exception.base;

/**
 * 基础异常
 * 
 * @author ruoyi
 */
public class BaseException extends RuntimeException
{
    private static final long serialVersionUID = 1L;

    /**
     * 所属模块
     */
    private String module;

    /**
     * 错误码
     */
    private String code;

    /**
     * 错误码对应的参数
     */
    private Object[] args;

    /**
     * 错误消息
     */
    private String defaultMessage;

    public BaseException(String module, String code, Object[] args, String defaultMessage)
    {
        this.module = module;
        this.code = code;
        this.args = args;
        this.defaultMessage = defaultMessage;
    }

    public BaseException(String module, String code, Object[] args)
    {
        this(module, code, args, null);
    }

    public BaseException(String module, String defaultMessage)
    {
        this(module, null, null, defaultMessage);
    }

    public BaseException(String code, Object[] args)
    {
        this(null, code, args, null);
    }

    public BaseException(String defaultMessage)
    {
        this(null, null, null, defaultMessage);
    }

    public String getModule()
    {
        return module;
    }

    public String getCode()
    {
        return code;
    }

    public Object[] getArgs()
    {
        return args;
    }

    public String getDefaultMessage()
    {
        return defaultMessage;
    }
}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java

@@ -1,6 +1,6 @@
package com.ruoyi.common.core.exception.file;



import com.ruoyi.common.core.exception.BaseException;

import com.ruoyi.common.core.exception.base.BaseException;



/**

 * 文件信息异常类


 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java

@@ -1,6 +1,6 @@
package com.ruoyi.common.core.exception.user;



import com.ruoyi.common.core.exception.BaseException;

import com.ruoyi.common.core.exception.base.BaseException;



/**

 * 用户信息异常类


 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java

@@ -1,6 +1,6 @@
package com.ruoyi.common.core.utils.sql;



import com.ruoyi.common.core.exception.BaseException;

import com.ruoyi.common.core.exception.UtilException;

import com.ruoyi.common.core.utils.StringUtils;



/**

@@ -22,7 +22,7 @@
    {

        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))

        {

            throw new BaseException("参数不符合规范，不能进行查询");

            throw new UtilException("参数不符合规范，不能进行查询");

        }

        return value;

    }


 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -1,16 +1,18 @@
package com.ruoyi.common.security.handler;



import javax.servlet.http.HttpServletRequest;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.validation.BindException;

import org.springframework.web.HttpRequestMethodNotSupportedException;

import org.springframework.web.bind.MethodArgumentNotValidException;

import org.springframework.web.bind.annotation.ExceptionHandler;

import org.springframework.web.bind.annotation.RestControllerAdvice;

import com.ruoyi.common.core.exception.BaseException;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.constant.HttpStatus;

import com.ruoyi.common.core.exception.DemoModeException;

import com.ruoyi.common.core.exception.InnerAuthException;

import com.ruoyi.common.core.exception.PreAuthorizeException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.web.domain.AjaxResult;



@@ -25,31 +27,58 @@
    private static final Logger log = LoggerFactory.getLogger(GlobalExceptionHandler.class);



    /**

     * 基础异常

     * 权限异常

     */

    @ExceptionHandler(BaseException.class)

    public AjaxResult baseException(BaseException e)

    @ExceptionHandler(PreAuthorizeException.class)

    public AjaxResult handlePreAuthorizeException(PreAuthorizeException e, HttpServletRequest request)

    {

        return AjaxResult.error(e.getDefaultMessage());

        String requestURI = request.getRequestURI();

        log.error("请求地址'{}',权限校验失败'{}'", requestURI, e.getMessage());

        return AjaxResult.error(HttpStatus.FORBIDDEN, "没有权限，请联系管理员授权");

    }



    /**

     * 请求方式不支持

     */

    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)

    public AjaxResult handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,

            HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());

        return AjaxResult.error(e.getMessage());

    }



    /**

     * 业务异常

     */

    @ExceptionHandler(CustomException.class)

    public AjaxResult businessException(CustomException e)

    {

        if (StringUtils.isNull(e.getCode()))

        {

            return AjaxResult.error(e.getMessage());

        }

        return AjaxResult.error(e.getCode(), e.getMessage());

    }



    @ExceptionHandler(Exception.class)

    public AjaxResult handleException(Exception e)

    @ExceptionHandler(ServiceException.class)

    public AjaxResult handleServiceException(ServiceException e, HttpServletRequest request)

    {

        log.error(e.getMessage(), e);

        Integer code = e.getCode();

        return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage());

    }



    /**

     * 拦截未知的运行时异常

     */

    @ExceptionHandler(RuntimeException.class)

    public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        log.error("请求地址'{}',发生未知异常.", requestURI, e);

        return AjaxResult.error(e.getMessage());

    }



    /**

     * 系统异常

     */

    @ExceptionHandler(Exception.class)

    public AjaxResult handleException(Exception e, HttpServletRequest request)

    {

        String requestURI = request.getRequestURI();

        log.error("请求地址'{}',发生系统异常.", requestURI, e);

        return AjaxResult.error(e.getMessage());

    }



@@ -57,7 +86,7 @@
     * 自定义验证异常

     */

    @ExceptionHandler(BindException.class)

    public AjaxResult validatedBindException(BindException e)

    public AjaxResult handleBindException(BindException e)

    {

        log.error(e.getMessage(), e);

        String message = e.getAllErrors().get(0).getDefaultMessage();

@@ -68,7 +97,7 @@
     * 自定义验证异常

     */

    @ExceptionHandler(MethodArgumentNotValidException.class)

    public Object validExceptionHandler(MethodArgumentNotValidException e)

    public Object handleMethodArgumentNotValidException(MethodArgumentNotValidException e)

    {

        log.error(e.getMessage(), e);

        String message = e.getBindingResult().getFieldError().getDefaultMessage();

@@ -76,19 +105,10 @@
    }



    /**

     * 权限异常

     */

    @ExceptionHandler(PreAuthorizeException.class)

    public AjaxResult preAuthorizeException(PreAuthorizeException e)

    {

        return AjaxResult.error("没有权限，请联系管理员授权");

    }



    /**

     * 内部认证异常

     */

    @ExceptionHandler(InnerAuthException.class)

    public AjaxResult InnerAuthException(InnerAuthException e)

    public AjaxResult handleInnerAuthException(InnerAuthException e)

    {

        return AjaxResult.error(e.getMessage());

    }

@@ -97,7 +117,7 @@
     * 演示模式异常

     */

    @ExceptionHandler(DemoModeException.class)

    public AjaxResult demoModeException(DemoModeException e)

    public AjaxResult handleDemoModeException(DemoModeException e)

    {

        return AjaxResult.error("演示模式，不允许操作");

    }


 ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -24,7 +24,7 @@
import com.alibaba.fastjson.JSONObject;

import com.ruoyi.common.core.constant.Constants;

import com.ruoyi.common.core.constant.GenConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.text.CharsetKit;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

@@ -180,7 +180,7 @@
        }

        catch (Exception e)

        {

            throw new CustomException("导入失败：" + e.getMessage());

            throw new ServiceException("导入失败：" + e.getMessage());

        }

    }



@@ -269,7 +269,7 @@
                }

                catch (IOException e)

                {

                    throw new CustomException("渲染模板失败，表名：" + table.getTableName());

                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());

                }

            }

        }

@@ -291,7 +291,7 @@
        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);

        if (StringUtils.isEmpty(dbTableColumns))

        {

            throw new CustomException("同步数据失败，原表结构不存在");

            throw new ServiceException("同步数据失败，原表结构不存在");

        }

        List<String> dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList());



@@ -383,25 +383,25 @@
            JSONObject paramsObj = JSONObject.parseObject(options);

            if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE)))

            {

                throw new CustomException("树编码字段不能为空");

                throw new ServiceException("树编码字段不能为空");

            }

            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE)))

            {

                throw new CustomException("树父编码字段不能为空");

                throw new ServiceException("树父编码字段不能为空");

            }

            else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME)))

            {

                throw new CustomException("树名称字段不能为空");

                throw new ServiceException("树名称字段不能为空");

            }

            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))

            {

                if (StringUtils.isEmpty(genTable.getSubTableName()))

                {

                    throw new CustomException("关联子表的表名不能为空");

                    throw new ServiceException("关联子表的表名不能为空");

                }

                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))

                {

                    throw new CustomException("子表关联的外键名不能为空");

                    throw new ServiceException("子表关联的外键名不能为空");

                }

            }

        }


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

@@ -7,7 +7,7 @@
import org.springframework.stereotype.Service;

import com.ruoyi.common.core.constant.Constants;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.redis.service.RedisService;

@@ -137,7 +137,7 @@
            SysConfig config = selectConfigById(configId);

            if (StringUtils.equals(UserConstants.YES, config.getConfigType()))

            {

                throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));

                throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));

            }

            configMapper.deleteConfigById(configId);

            redisService.deleteObject(getCacheKey(config.getConfigKey()));


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

@@ -7,7 +7,7 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.datascope.annotation.DataScope;

@@ -184,7 +184,7 @@
        // 如果父节点不为正常状态,则不允许新增子节点

        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))

        {

            throw new CustomException("部门停用，不允许新增");

            throw new ServiceException("部门停用，不允许新增");

        }

        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());

        return deptMapper.insertDept(dept);


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

@@ -6,7 +6,7 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.security.utils.DictUtils;

import com.ruoyi.system.api.domain.SysDictData;

@@ -122,7 +122,7 @@
            SysDictType dictType = selectDictTypeById(dictId);

            if (dictDataMapper.countDictDataByType(dictType.getDictType()) > 0)

            {

                throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));

                throw new ServiceException(String.format("%1$s已分配,不能删除", dictType.getDictName()));

            }

            dictTypeMapper.deleteDictTypeById(dictId);

            DictUtils.removeDictCache(dictType.getDictType());


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

@@ -6,7 +6,7 @@
import org.springframework.stereotype.Service;



import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.system.domain.SysPost;

import com.ruoyi.system.mapper.SysPostMapper;

@@ -149,7 +149,7 @@
            SysPost post = selectPostById(postId);

            if (countUserPostById(postId) > 0)

            {

                throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));

                throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));

            }

        }

        return postMapper.deletePostByIds(postIds);


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

@@ -9,7 +9,7 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.SpringUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.datascope.annotation.DataScope;

@@ -183,7 +183,7 @@
    {

        if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())

        {

            throw new CustomException("不允许操作超级管理员角色");

            throw new ServiceException("不允许操作超级管理员角色");

        }

    }



@@ -342,7 +342,7 @@
            SysRole role = selectRoleById(roleId);

            if (countUserRoleByRoleId(roleId) > 0)

            {

                throw new CustomException(String.format("%1$s已分配,不能删除", role.getRoleName()));

                throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));

            }

        }

        // 删除角色与菜单关联


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

@@ -8,7 +8,7 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.exception.CustomException;

import com.ruoyi.common.core.exception.ServiceException;

import com.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.datascope.annotation.DataScope;

@@ -223,7 +223,7 @@
    {

        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())

        {

            throw new CustomException("不允许操作超级管理员用户");

            throw new ServiceException("不允许操作超级管理员用户");

        }

    }



@@ -485,7 +485,7 @@
    {

        if (StringUtils.isNull(userList) || userList.size() == 0)

        {

            throw new CustomException("导入用户数据不能为空！");

            throw new ServiceException("导入用户数据不能为空！");

        }

        int successNum = 0;

        int failureNum = 0;

@@ -530,7 +530,7 @@
        if (failureNum > 0)

        {

            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");

            throw new CustomException(failureMsg.toString());

            throw new ServiceException(failureMsg.toString());

        }

        else

        {