Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !280

Merged
Opened Feb 14, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

表示関係の不具合を修正

ロック・アイコンの表示が消えない問題を修正

Edited Feb 14, 2023 by Kazuyuki Hida
  • Discussion 2
  • Commits 2
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 14, 2023
    Resolved by Yujin Seo Feb 14, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
    249 252 }
    250 253 if (loginId != null) {
    251 sql.append(" AND report_lock_user_id <> ? "); //自分以外のロックを変更しないため
    254 sql.append(" AND report_lock_user_id=? "); //自分以外のロックを変更しないため
    252 255 }
    253 256 args.add(reportStatus);
    254 257 args.add(reportLockUserId);
    255 258 args.add(reportLockUserName);
    256 259 args.add(reportLockTime);
    257 args.add(taskKey);
    258 260 if (reportStartDate != null) {
    259 args.add(reportStartDate);
    261 args.add(taskReportId);
    262 args.add(DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC"));
    263 } else {
    264 args.add(taskKey);
    • Kazuyuki Hida @hida-k commented Feb 14, 2023
      Developer

      SQLが不適切で、ロックしている状態を更新できていなかったのを修正。 引数が増えたので、関連するコードを一通り修正した。

      Edited Feb 14, 2023
      SQLが不適切で、ロックしている状態を更新できていなかったのを修正。 引数が増えたので、関連するコードを一通り修正した。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 14, 2023
    Resolved by Yujin Seo Feb 14, 2023
    dashboard @ b1f1c80f
    1 Subproject commit 65ba4f84e09897cbf524b7f266bcefb158448b33
    1 Subproject commit b1f1c80f998120d31c1f58128434c894ae57e2e1
    • Kazuyuki Hida @hida-k commented Feb 14, 2023
      Developer

      サブモジュールをアップデート

      Edited Feb 14, 2023
      サブモジュールをアップデート
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Feb 14, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    Feb 14, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Yujin Seo @seo

    resolved all discussions

    Feb 14, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Feb 14, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit d3af397f

    Feb 14, 2023

    mentioned in commit d3af397f

    mentioned in commit d3af397f89c0bc7f3f627ed378390279c3fdee74
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Yujin Seo
Assignee
Yujin Seo @seo
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abook_android/abook_check!280
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.