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 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 getCoordinate(String requestIp, MarkReqVo vo) { Map 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;