From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ff8f6f1..42dde42 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -56,7 +56,14 @@
if(user==null)
{
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
{
//提示用户名或密码错误
@@ -182,9 +189,9 @@
Assert.notNull(pageNum, "pageNum can not be empty");
Assert.notNull(pageSize, "pageSize can not be empty");
Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
- List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword);
+ List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
- int num=IUserService.selectNum("3",keyword);
+ int num=IUserService.selectNum("3",keyword,null);
return getDataTable(list,num);
}
--
Gitblit v1.7.1