From acdd020f612ad4964872a06f87b80b15f967c1ab Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 15:17:35 +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 | 15 ++++++++-------
1 files changed, 8 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 7939bda..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);
}
@@ -92,7 +93,7 @@
newUser.setUserId(huaChengSysUser.getUserId()+"");
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
- newUser.setUserType("4");
+ newUser.setUserType("3");
newUser.setPhonenumber(huaChengSysUser.getPhone());
newUser.setSex(huaChengSysUser.getSex());
newUser.setAvatar(huaChengSysUser.getImageUrl());
@@ -254,8 +255,8 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
- return baseMapper.selectConfigList(page, state,userType,userName,ids);
+ 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
@@ -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