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
dc25f31d
Commit
dc25f31d
authored
Dec 27, 2021
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.删除被调整代码
parent
bb45103a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
10 deletions
+1
-10
OrgUsrMapper.xml
...ule-common-api/src/main/resources/mapper/OrgUsrMapper.xml
+0
-3
AreaController.java
...va/com/yeejoin/equipmanage/controller/AreaController.java
+1
-7
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml
View file @
dc25f31d
...
@@ -766,9 +766,6 @@ LEFT JOIN (
...
@@ -766,9 +766,6 @@ LEFT JOIN (
AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
AND ( usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
</otherwise>
</otherwise>
</choose>
</choose>
<if
test=
"bizOrgCode!='' and bizOrgCode!=null"
>
AND usr.biz_org_code like CONCAT('%',#{bizOrgCode},'%')
</if>
and usr.is_delete = false
and usr.is_delete = false
</where>
</where>
</select>
</select>
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/AreaController.java
View file @
dc25f31d
...
@@ -63,13 +63,7 @@ public class AreaController extends AbstractBaseController {
...
@@ -63,13 +63,7 @@ public class AreaController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登陆人获取公司树"
,
notes
=
"根据登陆人获取公司树"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据登陆人获取公司树"
,
notes
=
"根据登陆人获取公司树"
)
@GetMapping
(
value
=
"/companyTreeByUserAndType"
)
@GetMapping
(
value
=
"/companyTreeByUserAndType"
)
public
List
<
OrgMenuDto
>
companyTreeByUserAndType
(
@RequestParam
(
required
=
false
)
String
type
,
public
List
<
OrgMenuDto
>
companyTreeByUserAndType
(){
@RequestParam
(
required
=
false
)
String
bizOrgCode
){
// 获取登陆人角色
ReginParams
reginParams
=
getSelectedOrgInfo
();
if
(
StringUtil
.
isNotEmpty
(
bizOrgCode
))
{
reginParams
.
getPersonIdentity
().
setBizOrgCode
(
bizOrgCode
);
}
return
iAreaService
.
companyDeptTree
();
return
iAreaService
.
companyDeptTree
();
}
}
...
...
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