Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YeeAmosFireAutoSysRoot
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
station
YeeAmosFireAutoSysRoot
Commits
fb57b907
Commit
fb57b907
authored
Dec 02, 2022
by
高建强
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
item:应急处置修改人员默认头像
parent
c0ed1a43
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
ContingencyInstanceImpl.java
...os/fas/business/service/impl/ContingencyInstanceImpl.java
+6
-1
PlanVisual3dServiceImpl.java
...os/fas/business/service/impl/PlanVisual3dServiceImpl.java
+6
-1
No files found.
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java
View file @
fb57b907
...
...
@@ -518,7 +518,12 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
contingencyPlanInstance
.
setStartUserId
(
user
.
getUserId
());
contingencyPlanInstance
.
setStartUserName
(
user
.
getRealName
());
Map
<
String
,
String
>
userInfo
=
contingencyPlanInstanceMapper
.
getUserByUserId
(
user
.
getUserId
());
contingencyPlanInstance
.
setPersonImg
(
ObjectUtils
.
isEmpty
(
userInfo
)
?
personImg
:
userInfo
.
getOrDefault
(
"personImg"
,
personImg
));
if
(!
ObjectUtils
.
isEmpty
(
userInfo
))
{
String
img
=
userInfo
.
get
(
"personImg"
);
contingencyPlanInstance
.
setPersonImg
(
StringUtils
.
isBlank
(
img
)
?
personImg
:
img
);
}
else
{
contingencyPlanInstance
.
setPersonImg
(
personImg
);
}
}
return
contingencyPlanInstance
;
}
...
...
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java
View file @
fb57b907
...
...
@@ -497,7 +497,12 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
dto
.
setRecordType
(
"REPLYMESSAGE"
);
dto
.
setCreateDate
(
new
Date
());
Map
<
String
,
String
>
userInfo
=
contingencyPlanInstanceMapper
.
getUserByUserId
(
user
.
getUserId
());
dto
.
setPersonImg
(
ObjectUtils
.
isEmpty
(
userInfo
)
?
personImg
:
userInfo
.
getOrDefault
(
"personImg"
,
personImg
));
if
(!
ObjectUtils
.
isEmpty
(
userInfo
))
{
String
img
=
userInfo
.
get
(
"personImg"
);
dto
.
setPersonImg
(
StringUtils
.
isBlank
(
img
)
?
personImg
:
img
);
}
else
{
dto
.
setPersonImg
(
personImg
);
}
dto
.
setContent
(
StringUtil
.
isNotEmpty
(
dto
.
getContent
())
?
dto
.
getContent
()
:
""
);
repository
.
save
(
dto
);
String
topic
=
String
.
format
(
"/%s/%s/%s"
,
serviceName
,
stationName
,
"plan"
);
...
...
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