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
3a2cb836
Commit
3a2cb836
authored
Jan 03, 2023
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
58352b4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
OrgPersonController.java
...oot/module/common/biz/controller/OrgPersonController.java
+1
-1
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+2
-2
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/OrgPersonController.java
View file @
3a2cb836
...
...
@@ -253,7 +253,7 @@ public class OrgPersonController extends BaseController {
Map
<
String
,
Object
>
req
=
new
HashMap
<>();
ReginParams
reginParams
=
getSelectedOrgInfo
();
String
bizOrgCode
=
reginParams
.
getPersonIdentity
().
getCompanyBizOrgCode
();
req
.
put
(
"
biz
OrgCode"
,
bizOrgCode
);
req
.
put
(
"OrgCode"
,
bizOrgCode
);
// if(redisUtils.get("userList:" + bizOrgCode) != null){
// return ResponseHelper.buildResponse(redisUtils.get("userList:" + bizOrgCode));
// }
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @
3a2cb836
...
...
@@ -676,7 +676,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
}
public
IPage
<
Map
<
String
,
Object
>>
listAllByCurrentUser
(
String
pageNum
,
String
pageSize
,
Map
<
String
,
Object
>
req
)
{
String
bizOrgCode
=
req
.
get
(
"bizOrgCode"
).
toString
();
IPage
<
Map
<
String
,
Object
>>
pageBean
=
null
;
if
(
StringUtils
.
isBlank
(
pageNum
)
||
StringUtils
.
isBlank
(
pageSize
))
{
pageBean
=
new
Page
<>(
0
,
Long
.
MAX_VALUE
);
...
...
@@ -3173,7 +3173,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
dynamicFormInstance
.
setFieldValueLabel
(
dataDictionaryService
.
getById
(
dynamicFormInstance
.
getFieldValue
()).
getName
());
}
if
(
"positionType"
.
equals
(
dynamicFormInstance
.
getFieldCode
())
&&
peopleInfoDto
.
getFirefighters
().
getJobTitleCode
()
!=
null
){
dynamicFormInstance
.
setFieldValueLabel
(
dataDictionaryService
.
getById
(
peopleInfoDto
.
getFirefighters
().
getJobTitleCode
()).
getNam
e
());
dynamicFormInstance
.
setFieldValueLabel
(
peopleInfoDto
.
getFirefighters
().
getJobTitl
e
());
}
if
(
"administrativePositionCode"
.
equals
(
dynamicFormInstance
.
getFieldCode
())
&&
firefightersPost
.
getAdministrativePositionCode
()
!=
null
){
dynamicFormInstance
.
setFieldValueLabel
(
dataDictionaryService
.
getById
(
map1
.
get
(
"administrativePositionCode"
).
toString
()).
getName
());
...
...
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