Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
a16d0d92
Commit
a16d0d92
authored
Jan 06, 2022
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.水源、微型消防站、队伍树调整未公司树
parent
120843e9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
FireStationController.java
...t/module/common/biz/controller/FireStationController.java
+4
-3
FireTeamController.java
...boot/module/common/biz/controller/FireTeamController.java
+4
-3
WaterResourceController.java
...module/common/biz/controller/WaterResourceController.java
+0
-0
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireStationController.java
View file @
a16d0d92
...
...
@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
import
com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify
;
import
com.yeejoin.amos.boot.module.common.api.dto.FireStationDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FireStationServiceImpl
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl
;
import
io.swagger.annotations.Api
;
...
...
@@ -181,12 +182,12 @@ public class FireStationController extends BaseController {
@PersonIdentify
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/tree/companyTreeByUserAndType"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"微型消防站单位
部门树"
,
notes
=
"微型消防站单位部门
树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
)
{
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"微型消防站单位
树"
,
notes
=
"微型消防站单位
树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
()
{
// 获取登陆人角色
ReginParams
reginParams
=
getSelectedOrgInfo
();
// 权限赋值
PermissionInterceptorContext
.
setDataAuthRule
(
authKey
);
return
ResponseHelper
.
buildResponse
(
iOrgUsrService
.
companyTreeByUserAndType
(
reginParams
,
type
));
return
ResponseHelper
.
buildResponse
(
iOrgUsrService
.
companyTreeByUserAndType
(
reginParams
,
OrgPersonEnum
.
公司
.
getKey
()
));
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FireTeamController.java
View file @
a16d0d92
...
...
@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.FireTeamListDto;
import
com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto
;
import
com.yeejoin.amos.boot.module.common.api.entity.FireTeam
;
import
com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl
;
import
com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl
;
import
io.swagger.annotations.Api
;
...
...
@@ -288,13 +289,13 @@ public class FireTeamController extends BaseController {
@PersonIdentify
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@RequestMapping
(
value
=
"/companyTreeByUserAndType"
,
method
=
RequestMethod
.
GET
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登录人及类型获取公司
部门树"
,
notes
=
"根据登录人及类型获取公司部门
树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
)
throws
Exception
{
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登录人及类型获取公司
树"
,
notes
=
"根据登录人及类型获取公司
树"
)
public
ResponseModel
<
List
<
OrgMenuDto
>>
companyTreeByUserAndType
(
)
{
// 获取登陆人角色
ReginParams
reginParams
=
getSelectedOrgInfo
();
// 权限赋值
PermissionInterceptorContext
.
setDataAuthRule
(
authKey
);
List
<
OrgMenuDto
>
menus
=
iOrgUsrService
.
companyTreeByUserAndType
(
reginParams
,
type
);
List
<
OrgMenuDto
>
menus
=
iOrgUsrService
.
companyTreeByUserAndType
(
reginParams
,
OrgPersonEnum
.
公司
.
getKey
()
);
return
ResponseHelper
.
buildResponse
(
menus
);
}
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java
View file @
a16d0d92
This diff is collapsed.
Click to expand it.
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