From 607cff1cefe640dee994e6d18d5f6a8f23c62755 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期二, 22 八月 2023 17:38:56 +0800 Subject: [PATCH] # 修改配置角色 报角色编码存在 --- server/src/main/java/doumeemes/api/ext/DeviceExtController.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java index c861e05..39931c4 100644 --- a/server/src/main/java/doumeemes/api/ext/DeviceExtController.java +++ b/server/src/main/java/doumeemes/api/ext/DeviceExtController.java @@ -30,10 +30,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; +import java.util.*; /** * 鐢熶骇璁惧淇℃伅鎺ュ彛 @@ -162,7 +159,7 @@ find.setModel(device.getModel()); find.setProcedureId(device.getProcedureId()); find.setStationCode(device.getStationCode()); - find.setType(device.getType()); + find.setType(Objects.nonNull(device.getType()) ? device.getType() : Constants.ONE); find.setGroupId(device.getGroupId()); find.setProduceWarehouseLocationId(device.getProduceWarehouseLocationId()); find.setFinishWarehouseLocationId(device.getFinishWarehouseLocationId()); -- Gitblit v1.9.3