From 6e75e88d710b2ef8cd7404ca31a79960cfdca890 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 27 七月 2021 12:48:28 +0800
Subject: [PATCH] update 同步ruoyi修正
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 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 466714b..69adbe1 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
@@ -52,7 +52,7 @@
private ISysConfigService configService;
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+ @DataScope(deptAlias = "d", userAlias = "u", isUser = true)
public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
}
@@ -64,9 +64,33 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+ @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));
}
/**
@@ -100,7 +124,7 @@
@Override
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
+ StringBuilder idsStr = new StringBuilder();
for (SysRole role : list) {
idsStr.append(role.getRoleName()).append(",");
}
@@ -119,7 +143,7 @@
@Override
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
+ StringBuilder idsStr = new StringBuilder();
for (SysPost post : list) {
idsStr.append(post.getPostName()).append(",");
}
@@ -232,6 +256,21 @@
}
/**
+ * 鐢ㄦ埛鎺堟潈瑙掕壊
+ *
+ * @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 鐢ㄦ埛淇℃伅
@@ -257,7 +296,7 @@
* 淇敼鐢ㄦ埛澶村儚
*
* @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
+ * @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@Override
@@ -311,9 +350,7 @@
list.add(ur);
}
if (list.size() > 0) {
- for (SysUserRole sysUserRole : list) {
- userRoleMapper.insert(sysUserRole);
- }
+ userRoleMapper.insertAll(list);
}
}
}
@@ -335,9 +372,29 @@
list.add(up);
}
if (list.size() > 0) {
- for (SysUserPost sysUserPost : list) {
- userPostMapper.insert(sysUserPost);
- }
+ userPostMapper.insertAll(list);
+ }
+ }
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛瑙掕壊淇℃伅
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @param roleIds 瑙掕壊缁�
+ */
+ public void insertUserRole(Long userId, Long[] roleIds) {
+ if (Validator.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);
}
}
}
@@ -381,9 +438,9 @@
/**
* 瀵煎叆鐢ㄦ埛鏁版嵁
*
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
+ * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
* @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @param operName 鎿嶄綔鐢ㄦ埛
+ * @param operName 鎿嶄綔鐢ㄦ埛
* @return 缁撴灉
*/
@Override
--
Gitblit v1.9.3