From 9ab83f4607be9bbc5547a8166931757cfbd8656f Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 14 Nov 2024 21:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/service/impl/EtAdminOrderServiceImpl.java | 7 +++++--
 .../com/ruoyi/system/service/impl/SysDeptServiceImpl.java  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java
index 64efa11..7054d8c 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtAdminOrderServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.util.List;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.ServiceConstants;
 import com.ruoyi.common.core.domain.entity.AsUser;
@@ -104,8 +105,10 @@ public class EtAdminOrderServiceImpl implements IEtAdminOrderService
                 adminOrder.setFaultTypeStr(etFault.getTypeStr());
             }
             AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(adminOrder.getSn());
-            adminOrder.setLatitude(asDevice.getLatitude());
-            adminOrder.setLongitude(asDevice.getLongitude());
+            if(ObjectUtil.isNotNull(asDevice) && StrUtil.isNotBlank(asDevice.getLongitude()) && StrUtil.isNotBlank(asDevice.getLatitude())){
+                adminOrder.setLatitude(asDevice.getLatitude());
+                adminOrder.setLongitude(asDevice.getLongitude());
+            }
         }
         return etAdminOrders;
     }
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index efa9c07..48fcc34 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -207,7 +207,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     {
         SysDept sysDept = deptMapper.selectDeptById(deptId);
         if(ObjectUtil.isNotNull(sysDept.getAppUserId())){
-            AsUser asUser = asUserService.selectUserById(sysDept.getAppUserId());
+            AsUser asUser = asUserMapper.selectUserById(sysDept.getAppUserId());
             sysDept.setUserName(asUser.getUserName());
         }
         return sysDept;