From 711c489a87a617b27de22e4f906f0539d6fd5501 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 11:05:06 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=A0?= =?UTF-8?q?=E4=BA=BA=E6=9C=BA=E5=A4=8D=E5=88=B6=E8=88=AA=E7=BA=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceQrtzServiceImpl.java | 1 + .../org/dromara/system/service/impl/SysDeptServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index bb817ed..430a1be 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -239,6 +239,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { entity.setWaylineId(e.getWaylineId()); entity.setWaylineName(e.getWaylineName()); entity.setSort(e.getSort()); + entity.setDeviceSn(e.getDeviceSn()); entity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_1); entity.setExecDate(Convert.toDate(endDate)); LoginUser loginUser = LoginHelper.getLoginUser(); diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index bd72fee..ba3b6d0 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -152,7 +152,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public List selectDeptByIds(List deptIds) { return baseMapper.selectDeptList(new LambdaQueryWrapper() - .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) + .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader,SysDept::getParentId) .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); }