From 01b70437d4ef3348e69b2af0dcbd7250e1234117 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 十一月 2022 13:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 4 +---
1 files changed, 1 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 0419dca..5266576 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
@@ -59,7 +59,7 @@
List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("",account,"");
HuaChengSysUser huaChengSysUser=null;
- if(list!=null || list.size()>0 )
+ if(list!=null && list.size()>0 )
{
huaChengSysUser=list.get(0);
}
@@ -308,8 +308,6 @@
{
return error("账户不能为空");
}
-
- config.setUserType("3");
config.setUpdateBy(sys.getUserId()+"");
--
Gitblit v1.7.1