Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
070d7026
Commit
070d7026
authored
Apr 12, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#33449 詳細画面で、履歴の最初と最後のみ画像・動画が再生されない
parent
557a5afc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
+6
-3
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
View file @
070d7026
...
...
@@ -1161,8 +1161,11 @@ public class OperationLogic extends AbstractLogic {
// 履歴なし:元のattachedFileSendFlg
// 履歴あり:true、ファイルに変更が無くてもzipファイル作成
// 履歴ありで、ローカルの添付ファイルが存在する場合、attachedFileSendFlgをtrueにセットする
if
(
taskReportSendDto
.
taskReportSendId
<
lastTaskReportSendId
||
(!
StringUtil
.
isNullOrEmpty
(
taskReportDto
.
localAttachedFileName
)
&&
operationDto
.
enableReportHistory
==
Constant
.
EnableReportHistory
.
Enable
))
{
if
(
taskReportSendDto
.
taskReportSendId
==
lastTaskReportSendId
)
{
if
(!
StringUtil
.
isNullOrEmpty
(
taskReportDto
.
localAttachedFileName
)
&&
operationDto
.
enableReportHistory
==
Constant
.
EnableReportHistory
.
Enable
)
{
taskReportDto
.
attachedFileSendFlg
=
true
;
}
}
else
{
taskReportDto
.
attachedFileSendFlg
=
true
;
}
...
...
@@ -1175,7 +1178,7 @@ public class OperationLogic extends AbstractLogic {
if
(
zipFile
!=
null
)
{
fileName
=
FileUtil
.
getFilenameWithoutExt
(
zipFile
.
getName
());
}
taskReportDto
.
localAttachedFileName
=
fileName
!=
null
?
SecurityUtil
.
getMd5Hash
(
fileName
)
:
null
;
taskReportDto
.
localAttachedFileName
=
fileName
!=
null
?
SecurityUtil
.
getMd5Hash
(
fileName
)
:
taskReportDto
.
localAttachedFileName
;
}
try
{
...
...
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