Commit ad37dfe15b4c6d5bd3a5516febb1b850973da231

Authored by 王明元
1 parent c56b5be4

2022年12月24日15:36:13 修复账号删除不取消待办问题

fw-dalaran-server/src/main/java/cn/fw/dalaran/server/task/TodoTask.java
@@ -117,16 +117,17 @@ public class TodoTask { @@ -117,16 +117,17 @@ public class TodoTask {
117 } 117 }
118 for (TodoHistory history : list) { 118 for (TodoHistory history : list) {
119 if (Objects.equals(history.getTodoCode(), Constants.ACCOUNT_INVALID)) {// 账号失效待办 119 if (Objects.equals(history.getTodoCode(), Constants.ACCOUNT_INVALID)) {// 账号失效待办
120 - Account account = accountService.getById(history.getDataId()); 120 + /*Account account = accountService.getById(history.getDataId());
121 if (Objects.isNull(account)) { 121 if (Objects.isNull(account)) {
122 continue; 122 continue;
  123 + }*/
  124 +
  125 + BackLogItemDTO dto = new BackLogItemDTO(history.getUserId(), history.getTodoCode(),
  126 + history.getDataId().toString(), new Date(), history.getShopId());// 构造待办参数
  127 + if (todoRpcService.complete(dto)) {
  128 + history.setTodoDone(Boolean.TRUE);
123 } 129 }
124 } 130 }
125 - BackLogItemDTO dto = new BackLogItemDTO(history.getUserId(), history.getTodoCode(),  
126 - history.getDataId().toString(), new Date(), history.getShopId());// 构造待办参数  
127 - if (todoRpcService.complete(dto)) {  
128 - history.setTodoDone(Boolean.TRUE);  
129 - }  
130 } 131 }
131 todoHistoryService.updateBatchById(list); 132 todoHistoryService.updateBatchById(list);
132 } 133 }