From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index d2ff786..f3ec58d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -55,7 +55,8 @@
@Override
public ResultData smsSend(SysUser user){
- return smsUtil.sendSms(user.getPhonenumber());
+ return smsUtil.sendSmsNew(user.getPhonenumber());
+
}
@Override
@@ -65,7 +66,14 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if( list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null)
{
SysUser newUser = new SysUser();
@@ -154,7 +162,14 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
SysUser newUser = new SysUser();
if(huaChengSysUser==null)
{
@@ -240,8 +255,8 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
- return baseMapper.selectConfigList(page, state,userType,userName);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
}
@Override
@@ -284,10 +299,15 @@
}
@Override
- public int selectNum(String userType,String userName) {
- return baseMapper.selectNum(userType,userName);
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
}
+
+
+
+
+
}
--
Gitblit v1.7.1