Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
92122740
Commit
92122740
authored
Mar 03, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 调整展示文字+去掉未使用的代码
parent
8f047cd0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
150 deletions
+1
-150
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+1
-1
SysUserDeptPermissionService.java
...s/v1/yifu/admin/service/SysUserDeptPermissionService.java
+0
-17
SysUserDeptPermissionServiceImpl.java
.../admin/service/impl/SysUserDeptPermissionServiceImpl.java
+0
-132
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
92122740
...
...
@@ -451,7 +451,7 @@ public class TInsuranceUnpurchaseApplyServiceImpl extends ServiceImpl<TInsurance
autoAuditRecord
.
setNodeId
(
CommonConstants
.
EMPTY_STRING
);
autoAuditRecord
.
setNodeName
(
"SSC审核"
);
autoAuditRecord
.
setApprovalMan
(
CommonConstants
.
ONE_STRING
);
autoAuditRecord
.
setApprovalManName
(
"系统默认审核通过"
);
autoAuditRecord
.
setApprovalManName
(
"
首次申请,
系统默认审核通过"
);
autoAuditRecord
.
setApprovalOpinion
(
"默认审核通过"
);
autoAuditRecord
.
setApprovalTime
(
LocalDateTime
.
now
());
autoAuditRecord
.
setDeleteFlag
(
CommonConstants
.
NOT_DELETE_FLAG
);
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/SysUserDeptPermissionService.java
View file @
92122740
...
...
@@ -44,23 +44,6 @@ public interface SysUserDeptPermissionService extends IService<SysUserDeptPermis
*/
SysUserDeptPermission
getInfo
(
String
projectNo
,
String
userId
);
/**
* 项目下用户数据权限
* @param projectNo 项目编号
* @param userId 用户ID
*
* @return UserPermissionVo 用户在指定项目下的权限
*/
UserPermissionVo
getUserPermissionVo
(
String
projectNo
,
String
userId
);
/**
* 用户所有项目的数据权限
* @param userId 用户ID
*
* @return Map<String, UserPermissionVo> 用户不同项目的数据权限
*/
Map
<
String
,
UserPermissionVo
>
getUserPermissionFlush
(
String
userId
);
/**
* 客户服务平台——用户权限控制
* @param sysUserDeptPermission 实体
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserDeptPermissionServiceImpl.java
View file @
92122740
...
...
@@ -73,139 +73,7 @@ public class SysUserDeptPermissionServiceImpl extends ServiceImpl<SysUserDeptPer
return
baseMapper
.
selectOne
(
permissionQuery
);
}
@Override
public
UserPermissionVo
getUserPermissionVo
(
String
projectNo
,
String
userId
)
{
UserPermissionVo
authority
=
new
UserPermissionVo
();
if
(
Common
.
isEmpty
(
projectNo
)
&&
Common
.
isEmpty
(
userId
))
{
log
.
error
(
"获取用户权限失败,缺少用户或项目信息"
);
return
authority
;
}
Object
cacheValue
=
redisUtil
.
get
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNo
+
"_"
+
userId
);
if
(
null
!=
cacheValue
)
{
authority
=
(
UserPermissionVo
)
cacheValue
;
}
else
{
Map
<
String
,
UserPermissionVo
>
tPermissionMapByProject
=
getUserPermissionFlush
(
userId
);
authority
=
tPermissionMapByProject
.
get
(
projectNo
);
}
return
authority
;
}
@Override
public
Map
<
String
,
UserPermissionVo
>
getUserPermissionFlush
(
String
userId
)
{
UserPermissionVo
authority
;
Map
<
String
,
UserPermissionVo
>
tPermissionMapByProject
=
new
HashMap
<>();
if
(
Common
.
isEmpty
(
userId
))
{
log
.
error
(
"获取用户权限失败,缺少用户信息"
);
return
tPermissionMapByProject
;
}
String
deptIdSplit
=
""
;
Long
deptId
=
0L
;
Set
<
String
>
permissionDbSet
=
null
;
List
<
SysUserDeptPermission
>
tPermissionInfoList
=
baseMapper
.
getUserDeptPermissionList
(
userId
);
if
(
Common
.
isEmpty
(
tPermissionInfoList
))
{
log
.
error
(
"获取用户权限失败,未获取到用户在项目下的权限信息>>用户"
+
userId
);
return
tPermissionMapByProject
;
}
Set
<
String
>
projectNoSet
=
tPermissionInfoList
.
stream
().
map
(
SysUserDeptPermission:
:
getProjectNo
).
collect
(
Collectors
.
toSet
());
Map
<
String
,
SysUserDeptPermission
>
tPermissionMap
=
tPermissionInfoList
.
stream
().
collect
(
Collectors
.
toMap
(
SysUserDeptPermission:
:
getProjectNo
,
v
->
v
,
(
v1
,
v2
)
->
v1
));
SysUserDeptPermission
tPermissionInfo
;
for
(
String
projectNoStr
:
projectNoSet
)
{
tPermissionInfo
=
tPermissionMap
.
get
(
projectNoStr
);
// 没有配置部门
if
(
Common
.
isEmpty
(
tPermissionInfo
)){
authority
=
new
UserPermissionVo
();
log
.
error
(
"获取用户权限失败,该用户指定项目权限{}"
,
userId
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
else
{
authority
=
new
UserPermissionVo
();
authority
.
setProjectNo
(
projectNoStr
);
authority
.
setProjectName
(
tPermissionInfo
.
getProjectName
());
authority
.
setUserType
(
tPermissionInfo
.
getUserType
());
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 全部数据
authority
.
setHaveAll
(
true
);
// redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 指定部门权限
if
(
Common
.
isNotKong
(
tPermissionInfo
.
getAppointDeptScope
()))
{
authority
.
setHaveAll
(
false
);
String
[]
appointDeptIdArr
=
tPermissionInfo
.
getAppointDeptScope
().
split
(
CommonConstants
.
COMMA_STRING
);
Set
<
String
>
appointDeptIdSet
=
Arrays
.
stream
(
appointDeptIdArr
).
collect
(
Collectors
.
toSet
());
authority
.
setDepartIdSet
(
appointDeptIdSet
);
authority
.
setUserId
(
userId
);
// redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
}
else
{
log
.
error
(
"获取用户权限失败,该用户指定部门权限为空{}"
,
userId
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
}
else
{
SysDept
sysDept
=
sysDeptMapper
.
selectById
(
tPermissionInfo
.
getDeptId
());
if
(
Common
.
isNotKong
(
sysDept
))
{
String
ancestors
=
sysDept
.
getAncestors
();
if
(
Common
.
isEmpty
(
ancestors
))
{
log
.
error
(
"获取用户权限失败,该用户所属部门关系为空{}"
,
sysDept
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
String
[]
ancestorsSplit
=
ancestors
.
split
(
CommonConstants
.
COMMA_STRING
);
if
(
CommonConstants
.
ONE_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 二级部门及以下
if
(
ancestorsSplit
.
length
==
2
)
{
deptIdSplit
=
ancestorsSplit
[
0
]
+
CommonConstants
.
COMMA_STRING
+
ancestorsSplit
[
1
]
+
CommonConstants
.
COMMA_STRING
+
sysDept
.
getDeptId
();
deptId
=
sysDept
.
getDeptId
();
}
else
if
(
ancestorsSplit
.
length
>
2
)
{
deptIdSplit
=
ancestorsSplit
[
0
]
+
CommonConstants
.
COMMA_STRING
+
ancestorsSplit
[
1
]
+
CommonConstants
.
COMMA_STRING
+
ancestorsSplit
[
2
];
deptId
=
Long
.
valueOf
(
ancestorsSplit
[
2
]);
}
else
{
log
.
error
(
"获取用户权限失败,该用户所在部门为顶级部门,未查到权限{}"
,
sysDept
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
}
else
if
(
CommonConstants
.
TWO_STRING
.
equals
(
tPermissionInfo
.
getPermissionsType
()))
{
// 本级部门及以下
deptIdSplit
=
ancestors
+
CommonConstants
.
COMMA_STRING
+
sysDept
.
getDeptId
();
deptId
=
sysDept
.
getDeptId
();
}
// 获取指定部门及下级部门的数据
List
<
SysDept
>
sysDeptList
=
sysDeptMapper
.
getDeptListByDeptId
(
deptIdSplit
,
deptId
);
if
(
Common
.
isNotKong
(
sysDeptList
))
{
permissionDbSet
=
new
HashSet
<>();
for
(
SysDept
deptOne
:
sysDeptList
){
permissionDbSet
.
add
(
String
.
valueOf
(
deptOne
.
getDeptId
()));
}
authority
.
setHaveAll
(
false
);
authority
.
setDepartIdSet
(
permissionDbSet
);
authority
.
setUserId
(
userId
);
//redisUtil.set(CacheConstants.PROJECT_USER_PERMISSION + projectNoStr +"_"+ userId, authority);
}
else
{
log
.
error
(
"获取用户权限失败,该用户部门及以下权限为空{}"
,
userId
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
}
else
{
log
.
error
(
"获取用户权限失败,该用户所属部门不存在{}"
,
userId
);
authority
.
setHaveAll
(
false
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
continue
;
}
}
}
// 赋值用户在不同项目下的权限
tPermissionMapByProject
.
put
(
projectNoStr
,
authority
);
redisUtil
.
set
(
CacheConstants
.
PROJECT_USER_PERMISSION
+
projectNoStr
+
"_"
+
userId
,
authority
);
}
return
tPermissionMapByProject
;
}
/**
* 客户服务平台——用户权限控制
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment