From 5e3982efd6493d3958bcdb18e0e8eb15d4c75bde Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Wed, 14 Jun 2023 11:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=92=E7=BA=BF=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=82=E6=95=B0bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mappers/SysUserMapperDao.xml       | 2 +-
 .../shxy/xymanager_service/impl/TerminalServiceImpl.java  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml
index 041e89e..9480b56 100644
--- a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml
@@ -130,7 +130,7 @@
         create_time as createTime,
         role
         from sys_users
-        WHERE  status = #{status}
+        WHERE  status = #{status} and role != 0
         order by create_time desc
     </select>
 
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
index d5d6012..a827421 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
@@ -370,7 +371,12 @@ public class TerminalServiceImpl implements TerminalService {
     public ServiceBody<PhotoMarkModel> getCoordinate(String requestIp, MarkReqVo vo) {
         Map<String, String> globalParams = XyCache.globalParams;
         String s = globalParams.get(GloableParamsType.ImgMark.value());
-        Integer integer = Integer.valueOf(s);
+        Integer integer = null;
+        if (StrUtil.isEmpty(s)) {
+            integer = 0;
+        } else {
+            integer = Integer.valueOf(s);
+        }
         PhotoMarkModel model = new PhotoMarkModel();
         model.setMarkEnable(integer);
         PhotoMarkDto dto = null;