Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
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
haoban3.0
haoban-manage3.0
Commits
69c2a7ca
Commit
69c2a7ca
authored
Sep 21, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:返回菜单
parent
edbd1dbd
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
10 deletions
+68
-10
HaobanRoleDTO.java
...ava/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java
+10
-0
TabHaobanMenuMapper.java
...n/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
+12
-4
HaobanRoleBO.java
.../gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java
+11
-0
HaobanRoleApiServiceImpl.java
...rvice/service/out/impl/role/HaobanRoleApiServiceImpl.java
+4
-0
HaobanMenuService.java
...haoban/manage/service/service/role/HaobanMenuService.java
+11
-2
HaobanMenuServiceImpl.java
...nage/service/service/role/impl/HaobanMenuServiceImpl.java
+8
-2
TabHaobanMenuMapper.xml
...ce/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
+12
-2
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java
View file @
69c2a7ca
...
...
@@ -48,6 +48,8 @@ public class HaobanRoleDTO implements Serializable {
* 0:运维后台;1:好办web
*/
private
Integer
systemFlag
;
private
List
<
HaobanMenuDTO
>
menuList
;
public
Long
getRoleId
()
{
return
roleId
;
...
...
@@ -152,5 +154,13 @@ public class HaobanRoleDTO implements Serializable {
public
void
setSystemFlag
(
Integer
systemFlag
)
{
this
.
systemFlag
=
systemFlag
;
}
public
List
<
HaobanMenuDTO
>
getMenuList
()
{
return
menuList
;
}
public
void
setMenuList
(
List
<
HaobanMenuDTO
>
menuList
)
{
this
.
menuList
=
menuList
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
View file @
69c2a7ca
...
...
@@ -77,19 +77,27 @@ public interface TabHaobanMenuMapper {
@Param
(
"systemFlag"
)
Integer
systemFlag
);
/**
* 获取
父菜单
* 获取
菜单code
*
* @param menuCodes 菜单代码
* @return {@link List}<{@link String}>
*/
List
<
String
>
getHaobanMenu
ByPid
(
@Param
(
"menuCodes"
)
List
<
String
>
menuCodes
);
List
<
String
>
getHaobanMenu
CodeListByCode
(
@Param
(
"menuCodes"
)
List
<
String
>
menuCodes
);
/**
* 获取子菜单
* 获取子菜单
code
*
* @param menuCodes 菜单代码
* @return {@link List}<{@link String}>
*/
List
<
String
>
getHaobanChildMenuByPid
(
@Param
(
"menuCodes"
)
List
<
String
>
menuCodes
);
List
<
String
>
getHaobanChildMenuCodeByPCode
(
@Param
(
"menuCodes"
)
List
<
String
>
menuCodes
);
/**
* 获取菜单列表
*
* @param menuCodes 菜单代码
* @return {@link List}<{@link String}>
*/
List
<
TabHaobanMenu
>
getHaobanMenuListByCode
(
@Param
(
"menuCodes"
)
List
<
String
>
menuCodes
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java
View file @
69c2a7ca
package
com
.
gic
.
haoban
.
manage
.
service
.
pojo
.
bo
.
role
;
import
com.gic.haoban.manage.api.dto.role.HaobanMenuDTO
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -48,6 +50,7 @@ public class HaobanRoleBO implements Serializable {
* 0:运维后台;1:好办web
*/
private
Integer
systemFlag
;
private
List
<
HaobanMenuDTO
>
menuList
;
public
Long
getRoleId
()
{
return
roleId
;
...
...
@@ -152,5 +155,13 @@ public class HaobanRoleBO implements Serializable {
public
void
setSystemFlag
(
Integer
systemFlag
)
{
this
.
systemFlag
=
systemFlag
;
}
public
List
<
HaobanMenuDTO
>
getMenuList
()
{
return
menuList
;
}
public
void
setMenuList
(
List
<
HaobanMenuDTO
>
menuList
)
{
this
.
menuList
=
menuList
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
View file @
69c2a7ca
...
...
@@ -7,6 +7,7 @@ import com.gic.haoban.app.customer.service.api.service.ManageSettingApiService;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
import
com.gic.haoban.manage.api.dto.role.HaobanMenuDTO
;
import
com.gic.haoban.manage.api.dto.role.HaobanRoleDTO
;
import
com.gic.haoban.manage.api.enums.role.RoleClerkTypeEnum
;
import
com.gic.haoban.manage.api.service.ApplicationSettingApiService
;
...
...
@@ -14,6 +15,7 @@ import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
import
com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanRole
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanRoleMenu
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO
;
import
com.gic.haoban.manage.service.service.WxEnterpriseRelatedService
;
import
com.gic.haoban.manage.service.service.role.HaobanMenuService
;
...
...
@@ -185,6 +187,8 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
if
(
haobanRoleBO
!=
null
)
{
List
<
String
>
menuCodes
=
haobanRoleMenuService
.
getByWxEnterpriseIdAndRoleId
(
wxEnterpriseId
,
haobanRoleBO
.
getRoleId
());
haobanRoleBO
.
setMenuCodes
(
menuCodes
);
List
<
HaobanMenuBO
>
haobanMenuList
=
haobanMenuService
.
getHaobanMenuList
(
menuCodes
);
haobanRoleBO
.
setMenuList
(
EntityUtil
.
changeEntityListNew
(
HaobanMenuDTO
.
class
,
haobanMenuList
));
}
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityNew
(
HaobanRoleDTO
.
class
,
haobanRoleBO
));
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java
View file @
69c2a7ca
...
...
@@ -74,9 +74,18 @@ public interface HaobanMenuService {
/**
* 获取子菜单(包含自己)
*
* @param menuCode 菜单代码
* @param menuCode
s
菜单代码
* @return {@link List}<{@link String}>
*/
List
<
String
>
getHaobanMenuByPid
(
List
<
String
>
menuCode
);
List
<
String
>
getHaobanMenuByPid
(
List
<
String
>
menuCodes
);
/**
* 获取菜单列表
*
* @param menuCodes 菜单代码
* @return {@link List}<{@link HaobanMenuBO}>
*/
List
<
HaobanMenuBO
>
getHaobanMenuList
(
List
<
String
>
menuCodes
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
View file @
69c2a7ca
...
...
@@ -99,13 +99,19 @@ public class HaobanMenuServiceImpl implements HaobanMenuService {
@Override
public
List
<
String
>
getHaobanMenuByPid
(
List
<
String
>
menuCodes
)
{
List
<
String
>
list
=
new
ArrayList
<>();
List
<
String
>
pidCodes
=
tabHaobanMenuMapper
.
getHaobanMenu
ByPid
(
menuCodes
);
List
<
String
>
childCodes
=
tabHaobanMenuMapper
.
getHaobanChildMenu
ByPid
(
menuCodes
);
List
<
String
>
pidCodes
=
tabHaobanMenuMapper
.
getHaobanMenu
CodeListByCode
(
menuCodes
);
List
<
String
>
childCodes
=
tabHaobanMenuMapper
.
getHaobanChildMenu
CodeByPCode
(
menuCodes
);
list
.
addAll
(
pidCodes
);
list
.
addAll
(
childCodes
);
return
list
;
}
@Override
public
List
<
HaobanMenuBO
>
getHaobanMenuList
(
List
<
String
>
menuCodes
)
{
List
<
TabHaobanMenu
>
haobanMenuListByCode
=
tabHaobanMenuMapper
.
getHaobanMenuListByCode
(
menuCodes
);
return
EntityUtil
.
changeEntityListNew
(
HaobanMenuBO
.
class
,
haobanMenuListByCode
);
}
public
List
<
HaobanMenuBO
>
iterateMenus
(
List
<
HaobanMenuBO
>
menuBOList
,
String
pCode
)
{
List
<
HaobanMenuBO
>
result
=
new
ArrayList
<>();
for
(
HaobanMenuBO
haobanMenuBO
:
menuBOList
)
{
...
...
haoban-manage3-service/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
View file @
69c2a7ca
...
...
@@ -159,7 +159,7 @@
order by c.menu_sort
</select>
<select
id=
"getHaobanMenu
ByPid
"
resultType=
"java.lang.String"
>
<select
id=
"getHaobanMenu
CodeListByCode
"
resultType=
"java.lang.String"
>
select
menu_code
from tab_haoban_menu
...
...
@@ -169,7 +169,7 @@
</foreach>
</select>
<select
id=
"getHaobanChildMenu
ByPid
"
resultType=
"java.lang.String"
>
<select
id=
"getHaobanChildMenu
CodeByPCode
"
resultType=
"java.lang.String"
>
select
menu_code
from tab_haoban_menu
...
...
@@ -179,5 +179,15 @@
</foreach>
</select>
<select
id=
"getHaobanMenuListByCode"
resultMap=
"TabHaobanMenuMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_menu
where status_flag = 1 and menu_code in
<foreach
collection=
"menuCodes"
open=
"("
close=
")"
separator=
","
item=
"item"
>
#{item}
</foreach>
</select>
</mapper>
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