Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
notes2.0
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zjm
notes2.0
Commits
27fe4a6b
提交
27fe4a6b
authored
3月 02, 2020
作者:
gongwenjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
接口注释,人员代码(剩下几个接口,需要任务模块提供接口才能写)
上级
176caa66
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
99 行增加
和
0 行删除
+99
-0
PasUserDao.java
...as/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java
+2
-0
RoleDao.java
...s-pas/src/main/java/com/zjty/tynotes/pas/dao/RoleDao.java
+2
-0
UserRoleDao.java
...s/src/main/java/com/zjty/tynotes/pas/dao/UserRoleDao.java
+2
-0
IUserService.java
.../main/java/com/zjty/tynotes/pas/service/IUserService.java
+15
-0
UserServiceImpl.java
...va/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java
+75
-0
UserManageServiceImpl.java
...es/weekly/subject/service/impl/UserManageServiceImpl.java
+3
-0
没有找到文件。
notes-pas/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java
浏览文件 @
27fe4a6b
...
...
@@ -88,4 +88,6 @@ public interface PasUserDao extends MongoRepository<User, String> {
* @return
*/
List
<
User
>
findAllByDepartmentIdIn
(
List
<
String
>
departmentIds
);
}
notes-pas/src/main/java/com/zjty/tynotes/pas/dao/RoleDao.java
浏览文件 @
27fe4a6b
...
...
@@ -12,4 +12,6 @@ import java.util.List;
*/
public
interface
RoleDao
extends
MongoRepository
<
Role
,
String
>
{
List
<
Role
>
findAllByIdIn
(
List
<
String
>
ids
);
List
<
Role
>
findAllByDepartmentIdAndIsLeader
(
String
departmentIds
,
String
isLeader
);
}
notes-pas/src/main/java/com/zjty/tynotes/pas/dao/UserRoleDao.java
浏览文件 @
27fe4a6b
...
...
@@ -15,4 +15,6 @@ public interface UserRoleDao extends MongoRepository<UserRole,String> {
List
<
UserRole
>
findAllByUserId
(
String
userId
);
void
deleteAllByUserId
(
String
userId
);
List
<
UserRole
>
findAllByRoleIdIn
(
List
<
String
>
roleIds
);
}
notes-pas/src/main/java/com/zjty/tynotes/pas/service/IUserService.java
浏览文件 @
27fe4a6b
...
...
@@ -82,4 +82,19 @@ public interface IUserService {
*/
User
addUser
(
User
user
);
/**
* 根据用户id判断是否有某个权限
* @param userId
* @param authorityName
* @return
*/
boolean
isHaveAuthority
(
String
userId
,
String
authorityName
);
/**
* 查询上级管理人员集合
* @param userId
* @return
*/
List
<
User
>
findParentManager
(
String
userId
);
}
notes-pas/src/main/java/com/zjty/tynotes/pas/service/impl/UserServiceImpl.java
浏览文件 @
27fe4a6b
...
...
@@ -176,6 +176,12 @@ public class UserServiceImpl implements IUserService {
public
User
addUser
(
User
user
)
{
List
<
Role
>
roles
=
user
.
getRoles
();
List
<
UserRole
>
userRoles
=
new
ArrayList
<>();
List
<
User
>
users
=
pasUserDao
.
findAll
();
for
(
User
user1
:
users
)
{
if
(
user1
.
getUsername
().
equals
(
user
.
getUsername
())){
return
null
;
}
}
User
save
=
pasUserDao
.
save
(
user
);
List
<
String
>
ids
=
new
ArrayList
<>();
if
(
roles
!=
null
){
...
...
@@ -194,5 +200,74 @@ public class UserServiceImpl implements IUserService {
return
save
;
}
@Override
public
boolean
isHaveAuthority
(
String
userId
,
String
authorityName
)
{
List
<
UserRole
>
userRoles
=
userRoleDao
.
findAllByUserId
(
userId
);
List
<
String
>
roleIds
=
new
ArrayList
<>();
for
(
UserRole
userRole
:
userRoles
)
{
roleIds
.
add
(
userRole
.
getRoleId
());
}
List
<
RoleAuthority
>
roleAuthorities
=
roleAuthorityDao
.
findAllByRoleIdIn
(
roleIds
);
List
<
String
>
authorityIds
=
new
ArrayList
<>();
for
(
RoleAuthority
roleAuthority
:
roleAuthorities
)
{
authorityIds
.
add
(
roleAuthority
.
getAuthorityId
());
}
List
<
Authority
>
authorities
=
authorityDao
.
findAllByIdIn
(
authorityIds
);
for
(
Authority
authority
:
authorities
)
{
if
(
authorityName
.
equals
(
authority
.
getName
())){
return
true
;
}
}
return
false
;
}
@Override
public
List
<
User
>
findParentManager
(
String
userId
)
{
List
<
User
>
users
=
new
ArrayList
<>();
List
<
UserRole
>
userRoles
=
userRoleDao
.
findAllByUserId
(
userId
);
List
<
String
>
roleIds
=
new
ArrayList
<>();
for
(
UserRole
userRole
:
userRoles
)
{
String
roleId
=
userRole
.
getRoleId
();
roleIds
.
add
(
roleId
);
}
List
<
Role
>
roles
=
roleDao
.
findAllByIdIn
(
roleIds
);
for
(
Role
role
:
roles
)
{
List
<
String
>
roleIds2
=
new
ArrayList
<>();
List
<
String
>
userIds
=
new
ArrayList
<>();
if
((
"1"
).
equals
(
role
.
getIsLeader
())){
List
<
Role
>
roles1
=
roleDao
.
findAllByDepartmentIdAndIsLeader
(
role
.
getDepartmentId
(),
"0"
);
for
(
Role
role1
:
roles1
)
{
roleIds2
.
add
(
role1
.
getId
());
}
List
<
UserRole
>
userRoleList
=
userRoleDao
.
findAllByRoleIdIn
(
roleIds2
);
for
(
UserRole
userRole
:
userRoleList
)
{
userIds
.
add
(
userRole
.
getUserId
());
}
List
<
User
>
userList
=
pasUserDao
.
findAllByIdIn
(
userIds
);
users
.
addAll
(
userList
);
}
else
{
Optional
<
Department
>
op
=
departmentDao
.
findById
(
role
.
getDepartmentId
());
if
(
op
.
isPresent
()){
Department
department
=
op
.
get
();
String
parentId
=
department
.
getParentId
();
List
<
Role
>
roles1
=
roleDao
.
findAllByDepartmentIdAndIsLeader
(
role
.
getDepartmentId
(),
"0"
);
for
(
Role
role1
:
roles1
)
{
roleIds2
.
add
(
role1
.
getId
());
}
List
<
UserRole
>
userRoleList
=
userRoleDao
.
findAllByRoleIdIn
(
roleIds2
);
for
(
UserRole
userRole
:
userRoleList
)
{
userIds
.
add
(
userRole
.
getUserId
());
}
List
<
User
>
userList
=
pasUserDao
.
findAllByIdIn
(
userIds
);
users
.
addAll
(
userList
);
}
}
}
return
null
;
}
}
notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java
浏览文件 @
27fe4a6b
...
...
@@ -163,4 +163,7 @@ public class UserManageServiceImpl implements UserManageService {
return
des
;
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论