From 6f30b5c886cd05081d6250eb0506816fb2ac80ec Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 14:11:30 +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 |   57 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 36 insertions(+), 21 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 8a699d6..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
@@ -49,18 +49,14 @@
 
     @Override
     public SysUser getUserByAccount(String account) {
-        HashMap<String, Object> map = new HashMap();
-        map.put("login_name", account);
-        List<SysUser> sysUsers = baseMapper.selectByMap(map);
-        if (sysUsers.size() > 0) {
-            return sysUsers.get(0);
-        }
-        return null;
+        SysUser sysUsers = baseMapper.getUserByAccount(account);
+        return sysUsers;
     }
 
     @Override
     public ResultData smsSend(SysUser user){
-       return smsUtil.sendSms(user.getPhonenumber());
+        return smsUtil.sendSmsNew(user.getPhonenumber());
+
     }
 
     @Override
@@ -70,11 +66,18 @@
         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();
-                newUser.setUserId(Snowflake.getId());
+                newUser.setUserId(Snowflake.getId()+"");
                 newUser.setLoginName(phonenumber);
                 newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
                 newUser.setUserType("3");
@@ -87,7 +90,7 @@
             else
             {
                 SysUser newUser = new SysUser();
-                newUser.setUserId(huaChengSysUser.getUserId());
+                newUser.setUserId(huaChengSysUser.getUserId()+"");
                 newUser.setLoginName(huaChengSysUser.getPhone());
                 newUser.setUserName(huaChengSysUser.getNickName());
                 newUser.setUserType("3");
@@ -159,11 +162,18 @@
         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)
             {
-                newUser.setUserId(Snowflake.getId());
+                newUser.setUserId(Snowflake.getId()+"");
                 newUser.setLoginName(phonenumber);
                 newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
                 newUser.setUserType("3");
@@ -228,8 +238,8 @@
     }
 
     @Override
-    public List<SysUser> queryList(Integer userType) {
-        return baseMapper.queryList(userType);
+    public List<SysUser> queryList(Integer userType,String keyWord) {
+        return baseMapper.queryList(userType,keyWord);
     }
 
     public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -245,13 +255,13 @@
     }
 
     @Override
-    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
-        return baseMapper.selectConfigList(page, state,userType);
+    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
-    public SysUser selectData(String userId) {
-        return baseMapper.selectData(userId);
+    public SysUser selectData(String userId,String phonenumber,String loginName) {
+        return baseMapper.selectData(userId,phonenumber,loginName);
     }
 
 
@@ -289,10 +299,15 @@
     }
 
     @Override
-    public int selectNum(String userType) {
-        return baseMapper.selectNum(userType);
+    public int selectNum(String userType,String userName,List<String> ids,String  isDivisionHead) {
+        return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
     }
 
 
 
+
+
+
+
+
 }

--
Gitblit v1.7.1