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
3f62427f
You need to sign in or sign up before continuing.
Commit
3f62427f
authored
Sep 08, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8
parents
bed72360
ed61ea1c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
2 deletions
+27
-2
SysUserPermission.java
...oud/plus/v1/yifu/permission/entity/SysUserPermission.java
+6
-0
SysUserPermissionVo.java
...cloud/plus/v1/yifu/permission/vo/SysUserPermissionVo.java
+8
-0
SysMenuServiceImpl.java
...d/plus/v1/permission/service/impl/SysMenuServiceImpl.java
+2
-2
SysUserPermissionServiceImpl.java
...permission/service/impl/SysUserPermissionServiceImpl.java
+1
-0
SysMenuMapper.xml
...ermission-biz/src/main/resources/mapper/SysMenuMapper.xml
+10
-0
No files found.
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserPermission.java
View file @
3f62427f
...
...
@@ -39,6 +39,12 @@ public class SysUserPermission extends BaseEntity {
@Schema
(
description
=
"登录账号"
)
private
String
empLoginName
;
/**
* 用户id
*/
@Schema
(
description
=
"用户id"
)
private
String
userId
;
/**
* 所在部门
*/
...
...
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/vo/SysUserPermissionVo.java
View file @
3f62427f
...
...
@@ -36,6 +36,14 @@ public class SysUserPermissionVo extends RowIndex implements Serializable {
@Schema
(
description
=
"登录账号"
)
@ExcelProperty
(
"登录账号"
)
private
String
empLoginName
;
/**
* 用户id
*/
@Schema
(
description
=
"用户id"
)
@ExcelAttribute
(
name
=
"用户id"
,
isExport
=
false
)
private
String
userId
;
/**
* 所属部门
*/
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysMenuServiceImpl.java
View file @
3f62427f
...
...
@@ -76,7 +76,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
if
(
errorStr
.
length
()
>
0
)
{
return
R
.
failed
(
errorStr
.
substring
(
0
,
errorStr
.
lastIndexOf
(
";"
)));
}
menu
.
setPermissionType
(
permissionType
.
substring
(
0
,
errorStr
.
lastIndexOf
(
"、"
)));
menu
.
setPermissionType
(
permissionType
.
substring
(
0
,
permissionType
.
lastIndexOf
(
"、"
)));
int
res
=
baseMapper
.
insert
(
menu
);
if
(
res
<=
CommonConstants
.
ZERO_INT
)
{
return
R
.
failed
();
...
...
@@ -95,7 +95,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
if
(
errorStr
.
length
()
>
0
)
{
return
R
.
failed
(
errorStr
.
substring
(
0
,
errorStr
.
lastIndexOf
(
";"
)));
}
menu
.
setPermissionType
(
permissionType
.
substring
(
0
,
errorStr
.
lastIndexOf
(
"、"
)));
menu
.
setPermissionType
(
permissionType
.
substring
(
0
,
permissionType
.
lastIndexOf
(
"、"
)));
baseMapper
.
updateById
(
menu
);
return
R
.
ok
();
}
...
...
yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java
View file @
3f62427f
...
...
@@ -273,6 +273,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
SysUserInfo
sysUserInfo
=
userInfo
.
get
(
0
);
excel
.
setEmpDept
(
sysUserInfo
.
getFdDeptName
());
excel
.
setEmpName
(
sysUserInfo
.
getFdName
());
excel
.
setUserId
(
sysUserInfo
.
getFdId
());
//判断表格权限类型是否正确
if
(
typeMap
.
isEmpty
())
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"获取权限类型字典值异常"
,
excel
));
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml
View file @
3f62427f
...
...
@@ -31,11 +31,21 @@
<sql
id=
"Base_Column_List"
>
a.ID,
a.MENU_NAME,
a.MODEL_ID,
a.MENU_NAME_PARENT,
a.MENU_PARENT_ID,
a.PERMISSION_TYPE,
a.PERMISSION_STATUS,
a.DELETE_STATUS,
a.INCOME_ID,
a.CUSTOMER_ID,
a.CONTRACT_ID,
a.BUSSINESS_ID,
a.QUOTATION_ID,
a.DOMAIN_ID,
a.BU_ID,
a.LINE_ID,
a.DEPT_ID,
a.CREATE_TIME
</sql>
<sql
id=
"sysMenu_where"
>
...
...
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