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
ec241192
Commit
ec241192
authored
Sep 19, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
c9952f47
cd1e1717
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
TEmployeeInfoController.java
.../v1/yifu/archives/controller/TEmployeeInfoController.java
+1
-1
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+1
-1
MenuUtil.java
...om/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
+1
-1
UserController.java
...u.cloud.plus.v1/yifu/admin/controller/UserController.java
+1
-1
SysDataAuthServiceImpl.java
...us.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java
+4
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeInfoController.java
View file @
ec241192
...
...
@@ -83,7 +83,7 @@ public class TEmployeeInfoController {
}
menuUtil
.
setAuthSql
(
user
,
tEmployeeInfo
);
if
(
Common
.
isNotNull
(
tEmployeeInfo
.
getAuthSql
())
&&
tEmployeeInfo
.
getAuthSql
().
contains
(
CommonConstants
.
A_DEPT_ID
))
{
tEmployeeInfo
.
setAuthSql
(
tEmployeeInfo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"b.
id
"
));
tEmployeeInfo
.
setAuthSql
(
tEmployeeInfo
.
getAuthSql
().
replace
(
CommonConstants
.
A_DEPT_ID
,
"b.
DEPT_ID
"
));
}
return
R
.
ok
(
tEmployeeInfoService
.
getPage
(
page
,
tEmployeeInfo
));
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
ec241192
...
...
@@ -491,7 +491,7 @@
select
<include
refid=
"baseParam"
/>
from t_employee_info a
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.contains('b.
id
') "
>
<if
test=
"tEmployeeInfo.authSql != null and tEmployeeInfo.authSql.contains('b.
DEPT_ID
') "
>
left join t_employee_project b on a.id=b.EMP_ID
</if>
where a.DELETE_FLAG = '0'
...
...
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/MenuUtil.java
View file @
ec241192
...
...
@@ -86,7 +86,7 @@ public class MenuUtil {
,
daprArchivesProperties
.
getAppId
(),
"/tsettledomain/getSettleDomainIdsByUserId"
,
user
.
getId
(),
TSettleDomainListVo
.
class
,
SecurityConstants
.
FROM_IN
);
StringBuilder
deptStr
=
new
StringBuilder
();
if
(
res
!=
null
&&
CommonConstants
.
SUCCESS
!
=
res
.
getCode
()
if
(
res
!=
null
&&
CommonConstants
.
SUCCESS
=
=
res
.
getCode
()
&&
res
.
getData
()
!=
null
&&
res
.
getData
().
getDeptIds
()
!=
null
&&
!
res
.
getData
().
getDeptIds
().
isEmpty
())
{
for
(
String
deptId
:
res
.
getData
().
getDeptIds
())
{
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/UserController.java
View file @
ec241192
...
...
@@ -303,7 +303,7 @@ public class UserController {
@Inner
@PostMapping
(
value
=
{
"/inner/getUserIdByDeptIds"
})
public
String
getUserIdByDeptIds
(
@RequestBody
String
deptIds
)
{
StringBuilder
userIds
=
new
StringBuilder
(
"
0
"
);
StringBuilder
userIds
=
new
StringBuilder
(
"
'0'
"
);
if
(
Common
.
isNotNull
(
deptIds
))
{
List
<
SysUser
>
sysUsers
=
userService
.
list
(
Wrappers
.<
SysUser
>
query
().
lambda
().
in
(
SysUser:
:
getDeptId
,
deptIds
));
if
(
Common
.
isNotEmpty
(
sysUsers
)){
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/service/impl/SysDataAuthServiceImpl.java
View file @
ec241192
...
...
@@ -108,13 +108,13 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
// 处理权限部门
if
(
sysDataAuth
.
getIsDeptAuth
()
==
1
||
sysDataAuth
.
getIsDeptAuth
()
==
2
)
{
if
(
sysDataAuth
.
getIsDeptAuth
()
==
2
)
{
sql
.
append
(
" or a.
create_user
in (start'0' "
);
sql
.
append
(
" or a.
CREATE_BY
in (start'0' "
);
for
(
SysDataAuthDeptRel
dept
:
authDeptList
)
{
sql
.
append
(
", '"
).
append
(
dept
.
getDeptId
()).
append
(
"'"
);
}
sql
.
append
(
"end)"
);
}
else
{
sql
.
append
(
" or a.
create_user
in (#deptId) "
);
sql
.
append
(
" or a.
CREATE_BY
in (#deptId) "
);
}
for
(
SysDataAuthMenuRel
menu
:
menuDeptList
)
{
authSqlMap
.
put
(
linkId
+
CommonConstants
.
DOWN_LINE_STRING
+
menu
.
getMenuId
(),
sql
.
toString
());
...
...
@@ -314,7 +314,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
if
(
menuDeptList
==
null
||
menuDeptList
.
isEmpty
())
{
return
R
.
failed
(
"请选择部门关联的菜单!"
);
}
else
if
(
sysDataAuth
.
getIsDeptAuth
()
==
2
)
{
sql
.
append
(
" or a.
create_user
in (start'0' "
);
sql
.
append
(
" or a.
CREATE_BY
in (start'0' "
);
for
(
SysDataAuthDeptRel
dept
:
authDeptList
)
{
sql
.
append
(
", '"
).
append
(
dept
.
getDeptId
()).
append
(
"'"
);
dept
.
setSysDataAuthId
(
mainId
);
...
...
@@ -322,7 +322,7 @@ public class SysDataAuthServiceImpl extends ServiceImpl<SysDataAuthMapper, SysDa
sql
.
append
(
"end)"
);
authDeptRelService
.
saveOrUpdateBatch
(
authDeptList
);
}
else
{
sql
.
append
(
" or a.
create_user
in (#deptId) "
);
sql
.
append
(
" or a.
CREATE_BY
in (#deptId) "
);
}
for
(
SysDataAuthMenuRel
menu
:
menuDeptList
)
{
authSqlMap
.
put
(
linkId
+
CommonConstants
.
DOWN_LINE_STRING
+
menu
.
getMenuId
(),
sql
.
toString
());
...
...
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