优化代码结构

ff9876c7 · cq990612 · a47f10d5 · ff9876c7
Commit ff9876c7 authored 4 years ago by cq990612
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

WorkTimeOrderServiceImpl.java ...a/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java +9 -5

No files found.
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java
@@ -265,13 +265,17 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
            workTimeOrder.setDeptId(workUserDeptService.getDeptIdByUserId(dto.getUserId()));
            BeanUtils.copyProperties(dto, workTimeOrder);
            totalTime += dto.getWorkTime();
-            WorkTimeOrder workTimeOrder1 = workTimeOrderMapper.selectById(dto.getWorkId());
-            if (2 == workTimeOrder1.getStatus()||5 == workTimeOrder1.getStatus()){
-                if (!dto.getStatus().equals(workTimeOrder1.getStatus())) {
-                    throw new BaseCustomException(BASE_RESP_CODE_ENUM.ORDER_EXAMINE);
+            if (dto.getWorkId() != null) {
+                WorkTimeOrder workTimeOrder1 = workTimeOrderMapper.selectById(dto.getWorkId());
+                if (2 == workTimeOrder1.getStatus() || 5 == workTimeOrder1.getStatus()) {
+                    if (!dto.getStatus().equals(workTimeOrder1.getStatus())) {
+                        throw new BaseCustomException(BASE_RESP_CODE_ENUM.ORDER_EXAMINE);
+                    }
+                    continue;
                }
-                continue;
            }
+
+
            BeanUtils.copyProperties(workTimeOrder, dto);
            addList.add(workTimeOrder);
        }