From e8455c5c7d5b2ebd6022aa82f20b49c4f425016d Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 14:45:45 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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 bf9c819..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
@@ -68,7 +69,7 @@
List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
HuaChengSysUser huaChengSysUser=null;
- if(list!=null || list.size()>0 )
+ if( list.size()>0 )
{
huaChengSysUser=list.get(0);
}
@@ -298,8 +299,8 @@
}
@Override
- public int selectNum(String userType,String userName,List<String> ids) {
- return baseMapper.selectNum(userType,userName,ids);
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
}
--
Gitblit v1.7.1