From 6fe3c583389375f1b54f5c260ae8e2604c11f515 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期二, 02 七月 2024 13:49:22 +0800 Subject: [PATCH] 电磁锁查询加入分页修改提交 --- ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java index df379cd..8c1b9b5 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java +++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java @@ -143,18 +143,19 @@ } @Override - public Results getAll(String usersId) { + //public Results List<Map<String,Object>> getAll(String usersId) { + public List<Map<String,Object>> getAll(String usersId) { ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId); - if(ardSyUser == null){ + /*if(ardSyUser == null){ return Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛"); - } + }*/ List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT"); String syURL = ""; if(syURLResult.size() != 0){ syURL = syURLResult.get(0).getConfigValue(); - }else{ + }/*else{ return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�"); - } + }*/ String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword()); Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId()); String sessionId = (String) LogInResult.get("sessionId"); @@ -205,6 +206,7 @@ } } } - return Results.succeed(result0); + //return Results.succeed(result0); + return result0; } } -- Gitblit v1.9.3