Browse Source

[feat]

1、修改无人机复制航线bug
pull/4/head
杨威 2 months ago
parent
commit
711c489a87
  1. 1
      dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java
  2. 2
      dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

1
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.setWaylineId(e.getWaylineId());
entity.setWaylineName(e.getWaylineName()); entity.setWaylineName(e.getWaylineName());
entity.setSort(e.getSort()); entity.setSort(e.getSort());
entity.setDeviceSn(e.getDeviceSn());
entity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_1); entity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_1);
entity.setExecDate(Convert.toDate(endDate)); entity.setExecDate(Convert.toDate(endDate));
LoginUser loginUser = LoginHelper.getLoginUser(); LoginUser loginUser = LoginHelper.getLoginUser();

2
dk-modules/system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@ -152,7 +152,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
@Override @Override
public List<SysDeptVo> selectDeptByIds(List<Long> deptIds) { public List<SysDeptVo> selectDeptByIds(List<Long> deptIds) {
return baseMapper.selectDeptList(new LambdaQueryWrapper<SysDept>() return baseMapper.selectDeptList(new LambdaQueryWrapper<SysDept>()
.select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader,SysDept::getParentId)
.eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL)
.in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds)); .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds));
} }

Loading…
Cancel
Save