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
f3228bad
Commit
f3228bad
authored
Sep 14, 2021
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
/*bug 2869 部门为空人员详情报空指针
parent
24403eed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
OrgUsrServiceImpl.java
...oot/module/common/biz/service/impl/OrgUsrServiceImpl.java
+5
-1
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/service/impl/OrgUsrServiceImpl.java
View file @
f3228bad
...
...
@@ -540,7 +540,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
List
<
DynamicFormInstanceDto
>
list
=
alertFormValueServiceImpl
.
listByCalledId
(
id
);
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
result
=
Bean
.
BeantoMap
(
orgUsr
);
result
.
put
(
"parenName"
,
getById
(
orgUsr
.
getParentId
()).
getBizOrgName
());
/*bug 2869 部门为空人员详情报空指针 2021-09-14 陈召 开始*/
if
(
getById
(
orgUsr
.
getParentId
())
!=
null
){
result
.
put
(
"parenName"
,
getById
(
orgUsr
.
getParentId
()).
getBizOrgName
());
}
/*bug 2869 部门为空人员详情报空指针 2021-09-14 陈召 结束*/
// 放入所有动态表单数据
for
(
DynamicFormColumn
alertForm
:
alertForms
)
{
result
.
put
(
alertForm
.
getFieldCode
(),
null
);
...
...
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