:zap: 统一异常类

src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java

@@ -17,7 +17,6 @@
 package org.springblade.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -87,7 +86,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 	public boolean removeDept(String ids) {
 		Integer cnt = baseMapper.selectCount(Wrappers.<Dept>query().lambda().in(Dept::getParentId, Func.toLongList(ids)));
 		if (cnt > 0) {
-			throw new ApiException("请先删除子节点!");
+			throw new ServiceException("请先删除子节点!");
 		}
 		return removeByIds(Func.toLongList(ids));
 	}

src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -19,9 +19,9 @@ package org.springblade.modules.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -75,7 +75,7 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 		LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dict.getCode()).eq(DictBiz::getDictKey, dict.getDictKey());
 		Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(DictBiz::getId, dict.getId()));
 		if (cnt > 0) {
-			throw new ApiException("当前字典键值已存在!");
+			throw new ServiceException("当前字典键值已存在!");
 		}
 		if (Func.isEmpty(dict.getParentId())) {
 			dict.setParentId(BladeConstant.TOP_PARENT_ID);
@@ -88,7 +88,7 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 	public boolean removeDict(String ids) {
 		Integer cnt = baseMapper.selectCount(Wrappers.<DictBiz>query().lambda().in(DictBiz::getParentId, Func.toLongList(ids)));
 		if (cnt > 0) {
-			throw new ApiException("请先删除子节点!");
+			throw new ServiceException("请先删除子节点!");
 		}
 		return removeByIds(Func.toLongList(ids));
 	}

src/main/java/org/springblade/modules/system/service/impl/DictServiceImpl.java

@@ -19,9 +19,9 @@ package org.springblade.modules.system.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -80,7 +80,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
 		LambdaQueryWrapper<Dict> lqw = Wrappers.<Dict>query().lambda().eq(Dict::getCode, dict.getCode()).eq(Dict::getDictKey, dict.getDictKey());
 		Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(Dict::getId, dict.getId()));
 		if (cnt > 0) {
-			throw new ApiException("当前字典键值已存在!");
+			throw new ServiceException("当前字典键值已存在!");
 		}
 		if (Func.isEmpty(dict.getParentId())) {
 			dict.setParentId(BladeConstant.TOP_PARENT_ID);
@@ -93,7 +93,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements ID
 	public boolean removeDict(String ids) {
 		Integer cnt = baseMapper.selectCount(Wrappers.<Dict>query().lambda().in(Dict::getParentId, Func.toLongList(ids)));
 		if (cnt > 0) {
-			throw new ApiException("请先删除子节点!");
+			throw new ServiceException("请先删除子节点!");
 		}
 		return removeByIds(Func.toLongList(ids));
 	}

src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -17,9 +17,9 @@
 package org.springblade.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -184,7 +184,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	public boolean removeMenu(String ids) {
 		Integer cnt = baseMapper.selectCount(Wrappers.<Menu>query().lambda().in(Menu::getParentId, Func.toLongList(ids)));
 		if (cnt > 0) {
-			throw new ApiException("请先删除子节点!");
+			throw new ServiceException("请先删除子节点!");
 		}
 		return removeByIds(Func.toLongList(ids));
 	}

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -19,7 +19,6 @@ package org.springblade.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.SysCache;
 import org.springblade.common.constant.CommonConstant;
@@ -69,7 +68,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		}
 		Integer userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, Func.toStr(tenantId, BladeConstant.ADMIN_TENANT_ID)).eq(User::getAccount, user.getAccount()));
 		if (userCount > 0 && Func.isEmpty(user.getId())) {
-			throw new ApiException("当前用户已存在!");
+			throw new ServiceException("当前用户已存在!");
 		}
 		return save(user) && submitUserDept(user);
 	}
@@ -154,7 +153,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	@Override
 	public boolean removeUser(String userIds) {
 		if (Func.contains(Func.toLongArray(userIds), SecureUtil.getUserId())) {
-			throw new ApiException("不能删除本账号!");
+			throw new ServiceException("不能删除本账号!");
 		}
 		return deleteLogic(Func.toLongList(userIds));
 	}