From c556e46c2a6232d74ab6dbf7566479ec955d905d Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 16 五月 2026 16:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
index 6d81820..ba3f63f 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/CheckTaskServiceImpl.java
@@ -197,7 +197,7 @@
BizResultCode.TASK_ALREADY_EXIST.check(task != null);
BizResultCode.DRIVER_CAR_NOT_MATCH.check(
entity.getDrivers() != null && entity.getCars() != null
- && entity.getDrivers().size() != entity.getCars().size());
+ && entity.getDrivers().size() != entity.getCars().size());
entity.setState(CheckTaskState.Published);
entity.setName(UUID.randomUUID().toString());
return super.add(creator, entity);
@@ -206,9 +206,9 @@
@Override
public CheckTask edit(CheckTask entity) {
BizResultCode.TASK_STATUS_ERROR.check(entity.getState() != CheckTaskState.Init
- && entity.getState() != CheckTaskState.Rejected
- && entity.getState() != CheckTaskState.EXECUTING
- && entity.getState() != CheckTaskState.Published);
+ && entity.getState() != CheckTaskState.Rejected
+ && entity.getState() != CheckTaskState.EXECUTING
+ && entity.getState() != CheckTaskState.Published);
return super.edit(entity);
}
@@ -391,7 +391,7 @@
var device = deviceUsage.getDevice();
var dt = buildDeviceHierarchyTree(modelTree, records, device);
dt.setId(device.getId());
- dt.setName(device.getName());
+ dt.setName(device.getManufacturerNumber());
treeRoot.addChild(dt);
});
return treeRoot;
--
Gitblit v1.7.1