qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
邱贞招 2024-11-14 21:48:32 +08:00
parent 8c7a19377b
commit 9ab83f4607
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
import java.util.List; import java.util.List;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.ServiceConstants; import com.ruoyi.common.constant.ServiceConstants;
import com.ruoyi.common.core.domain.entity.AsUser; import com.ruoyi.common.core.domain.entity.AsUser;
@ -104,8 +105,10 @@ public class EtAdminOrderServiceImpl implements IEtAdminOrderService
adminOrder.setFaultTypeStr(etFault.getTypeStr()); adminOrder.setFaultTypeStr(etFault.getTypeStr());
} }
AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(adminOrder.getSn()); AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(adminOrder.getSn());
adminOrder.setLatitude(asDevice.getLatitude()); if(ObjectUtil.isNotNull(asDevice) && StrUtil.isNotBlank(asDevice.getLongitude()) && StrUtil.isNotBlank(asDevice.getLatitude())){
adminOrder.setLongitude(asDevice.getLongitude()); adminOrder.setLatitude(asDevice.getLatitude());
adminOrder.setLongitude(asDevice.getLongitude());
}
} }
return etAdminOrders; return etAdminOrders;
} }

2
electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -207,7 +207,7 @@ public class SysDeptServiceImpl implements ISysDeptService
{ {
SysDept sysDept = deptMapper.selectDeptById(deptId); SysDept sysDept = deptMapper.selectDeptById(deptId);
if(ObjectUtil.isNotNull(sysDept.getAppUserId())){ if(ObjectUtil.isNotNull(sysDept.getAppUserId())){
AsUser asUser = asUserService.selectUserById(sysDept.getAppUserId()); AsUser asUser = asUserMapper.selectUserById(sysDept.getAppUserId());
sysDept.setUserName(asUser.getUserName()); sysDept.setUserName(asUser.getUserName());
} }
return sysDept; return sysDept;