From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 391 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 226 insertions(+), 165 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 8a4c12a..e1bd9cc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,42 +1,41 @@
package com.ruoyi.system.service.impl;
-import java.util.ArrayList;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
+@Slf4j
@Service
-public class SysUserServiceImpl implements ISysUserService
-{
- private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
-
- @Autowired
- private SysUserMapper userMapper;
+public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService {
@Autowired
private SysRoleMapper roleMapper;
@@ -53,60 +52,84 @@
@Autowired
private ISysConfigService configService;
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+ public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
+ }
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectUserList(SysUser user)
- {
- return userMapper.selectUserList(user);
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+ public List<SysUser> selectUserList(SysUser user) {
+ return baseMapper.selectUserList(user);
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+ public TableDataInfo<SysUser> selectAllocatedList(SysUser user) {
+ return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user));
+ }
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
+ */
+ @Override
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
+ public TableDataInfo<SysUser> selectUnallocatedList(SysUser user) {
+ return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user));
}
/**
* 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserByUserName(String userName)
- {
- return userMapper.selectUserByUserName(userName);
+ public SysUser selectUserByUserName(String userName) {
+ return baseMapper.selectUserByUserName(userName);
}
/**
* 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
- public SysUser selectUserById(Long userId)
- {
- return userMapper.selectUserById(userId);
+ public SysUser selectUserById(Long userId) {
+ return baseMapper.selectUserById(userId);
}
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
@Override
- public String selectUserRoleGroup(String userName)
- {
+ public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysRole role : list)
- {
+ StringBuilder idsStr = new StringBuilder();
+ for (SysRole role : list) {
idsStr.append(role.getRoleName()).append(",");
}
- if (StringUtils.isNotEmpty(idsStr.toString()))
- {
+ if (StringUtils.isNotEmpty(idsStr.toString())) {
return idsStr.substring(0, idsStr.length() - 1);
}
return idsStr.toString();
@@ -114,21 +137,18 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @return 缁撴灉
*/
@Override
- public String selectUserPostGroup(String userName)
- {
+ public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysPost post : list)
- {
+ StringBuilder idsStr = new StringBuilder();
+ for (SysPost post : list) {
idsStr.append(post.getPostName()).append(",");
}
- if (StringUtils.isNotEmpty(idsStr.toString()))
- {
+ if (StringUtils.isNotEmpty(idsStr.toString())) {
return idsStr.substring(0, idsStr.length() - 1);
}
return idsStr.toString();
@@ -136,16 +156,14 @@
/**
* 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
- *
+ *
* @param userName 鐢ㄦ埛鍚嶇О
* @return 缁撴灉
*/
@Override
- public String checkUserNameUnique(String userName)
- {
- int count = userMapper.checkUserNameUnique(userName);
- if (count > 0)
- {
+ public String checkUserNameUnique(String userName) {
+ long count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName).last("limit 1"));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -158,12 +176,12 @@
* @return
*/
@Override
- public String checkPhoneUnique(SysUser user)
- {
+ public String checkPhoneUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
- {
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getPhonenumber)
+ .eq(SysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -176,12 +194,12 @@
* @return
*/
@Override
- public String checkEmailUnique(SysUser user)
- {
+ public String checkEmailUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
- {
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getEmail)
+ .eq(SysUser::getEmail, user.getEmail()).last("limit 1"));
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -189,30 +207,44 @@
/**
* 鏍￠獙鐢ㄦ埛鏄惁鍏佽鎿嶄綔
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
*/
@Override
- public void checkUserAllowed(SysUser user)
- {
- if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
- {
- throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
+ public void checkUserAllowed(SysUser user) {
+ if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
+ throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳鐢ㄦ埛");
+ }
+ }
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param userId 鐢ㄦ埛id
+ */
+ @Override
+ public void checkUserDataScope(Long userId) {
+ if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
+ SysUser user = new SysUser();
+ user.setUserId(userId);
+ List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
+ if (StringUtils.isEmpty(users)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
+ }
}
}
/**
* 鏂板淇濆瓨鐢ㄦ埛淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int insertUser(SysUser user)
- {
+ public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
- int rows = userMapper.insertUser(user);
+ int rows = baseMapper.insert(user);
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -221,235 +253,264 @@
}
/**
+ * 娉ㄥ唽鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public boolean registerUser(SysUser user) {
+ return baseMapper.insert(user) > 0;
+ }
+
+ /**
* 淇敼淇濆瓨鐢ㄦ埛淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int updateUser(SysUser user)
- {
+ public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPostByUserId(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
- return userMapper.updateUser(user);
+ return baseMapper.updateById(user);
+ }
+
+ /**
+ * 鐢ㄦ埛鎺堟潈瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ @Override
+ @Transactional
+ public void insertUserAuth(Long userId, Long[] roleIds) {
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+ .eq(SysUserRole::getUserId, userId));
+ insertUserRole(userId, roleIds);
}
/**
* 淇敼鐢ㄦ埛鐘舵��
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateUserStatus(SysUser user)
- {
- return userMapper.updateUser(user);
+ public int updateUserStatus(SysUser user) {
+ return baseMapper.updateById(user);
}
/**
* 淇敼鐢ㄦ埛鍩烘湰淇℃伅
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateUserProfile(SysUser user)
- {
- return userMapper.updateUser(user);
+ public int updateUserProfile(SysUser user) {
+ return baseMapper.updateById(user);
}
/**
* 淇敼鐢ㄦ埛澶村儚
- *
+ *
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@Override
- public boolean updateUserAvatar(String userName, String avatar)
- {
- return userMapper.updateUserAvatar(userName, avatar) > 0;
+ public boolean updateUserAvatar(String userName, String avatar) {
+ return baseMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getAvatar, avatar)
+ .eq(SysUser::getUserName, userName)) > 0;
}
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
+ *
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
*/
@Override
- public int resetPwd(SysUser user)
- {
- return userMapper.updateUser(user);
+ public int resetPwd(SysUser user) {
+ return baseMapper.updateById(user);
}
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
+ *
* @param userName 鐢ㄦ埛鍚�
* @param password 瀵嗙爜
* @return 缁撴灉
*/
@Override
- public int resetUserPwd(String userName, String password)
- {
- return userMapper.resetUserPwd(userName, password);
+ public int resetUserPwd(String userName, String password) {
+ return baseMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getPassword, password)
+ .eq(SysUser::getUserName, userName));
}
/**
* 鏂板鐢ㄦ埛瑙掕壊淇℃伅
- *
+ *
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserRole(SysUser user)
- {
+ public void insertUserRole(SysUser user) {
Long[] roles = user.getRoleIds();
- if (StringUtils.isNotNull(roles))
- {
+ if (StringUtils.isNotNull(roles)) {
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysUserRole> list = new ArrayList<SysUserRole>();
- for (Long roleId : roles)
- {
+ for (Long roleId : roles) {
SysUserRole ur = new SysUserRole();
ur.setUserId(user.getUserId());
ur.setRoleId(roleId);
list.add(ur);
}
- if (list.size() > 0)
- {
- userRoleMapper.batchUserRole(list);
+ if (list.size() > 0) {
+ userRoleMapper.insertAll(list);
}
}
}
/**
* 鏂板鐢ㄦ埛宀椾綅淇℃伅
- *
+ *
* @param user 鐢ㄦ埛瀵硅薄
*/
- public void insertUserPost(SysUser user)
- {
+ public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
- if (StringUtils.isNotNull(posts))
- {
+ if (StringUtils.isNotNull(posts)) {
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
List<SysUserPost> list = new ArrayList<SysUserPost>();
- for (Long postId : posts)
- {
+ for (Long postId : posts) {
SysUserPost up = new SysUserPost();
up.setUserId(user.getUserId());
up.setPostId(postId);
list.add(up);
}
- if (list.size() > 0)
- {
- userPostMapper.batchUserPost(list);
+ if (list.size() > 0) {
+ userPostMapper.insertAll(list);
+ }
+ }
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛瑙掕壊淇℃伅
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ public void insertUserRole(Long userId, Long[] roleIds) {
+ if (StringUtils.isNotNull(roleIds)) {
+ // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ List<SysUserRole> list = new ArrayList<SysUserRole>();
+ for (Long roleId : roleIds) {
+ SysUserRole ur = new SysUserRole();
+ ur.setUserId(userId);
+ ur.setRoleId(roleId);
+ list.add(ur);
+ }
+ if (list.size() > 0) {
+ userRoleMapper.insertAll(list);
}
}
}
/**
* 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
@Override
- public int deleteUserById(Long userId)
- {
+ @Transactional
+ public int deleteUserById(Long userId) {
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
- userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
+ return baseMapper.deleteById(userId);
}
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
+ *
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
* @return 缁撴灉
*/
@Override
- public int deleteUserByIds(Long[] userIds)
- {
- for (Long userId : userIds)
- {
+ @Transactional
+ public int deleteUserByIds(Long[] userIds) {
+ for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
}
- return userMapper.deleteUserByIds(userIds);
+ List<Long> ids = Arrays.asList(userIds);
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, ids));
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));
+ return baseMapper.deleteBatchIds(ids);
}
/**
* 瀵煎叆鐢ㄦ埛鏁版嵁
- *
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+ *
+ * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
* @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
+ * @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
@Override
- public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
- {
- if (StringUtils.isNull(userList) || userList.size() == 0)
- {
- throw new CustomException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
+ public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+ if (StringUtils.isNull(userList) || userList.size() == 0) {
+ throw new ServiceException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
}
int successNum = 0;
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
- for (SysUser user : userList)
- {
- try
- {
+ for (SysUser user : userList) {
+ try {
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
- SysUser u = userMapper.selectUserByUserName(user.getUserName());
- if (StringUtils.isNull(u))
- {
+ SysUser u = baseMapper.selectUserByUserName(user.getUserName());
+ if (StringUtils.isNull(u)) {
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
this.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
- }
- else if (isUpdateSupport)
- {
+ } else if (isUpdateSupport) {
user.setUpdateBy(operName);
this.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
- }
- else
- {
+ } else {
failureNum++;
failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 宸插瓨鍦�");
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
failureNum++;
String msg = "<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛�";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
}
- if (failureNum > 0)
- {
+ if (failureNum > 0) {
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
- throw new CustomException(failureMsg.toString());
- }
- else
- {
+ throw new ServiceException(failureMsg.toString());
+ } else {
successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
}
return successMsg.toString();
--
Gitblit v1.9.3