From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 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..41b3628 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,17 +49,21 @@
 
     @Override
     public SysUser getUserByAccount(String account) {
+        baseMapper.setGroup();
         SysUser sysUsers = baseMapper.getUserByAccount(account);
         return sysUsers;
     }
 
     @Override
     public ResultData smsSend(SysUser user){
-       return smsUtil.sendSms(user.getPhonenumber());
+        baseMapper.setGroup();
+        return smsUtil.sendSmsNew(user.getPhonenumber());
+
     }
 
     @Override
     public ResultData loginByAccount(String phonenumber, String code){
+        baseMapper.setGroup();
         String code1 = redisTemplate.opsForValue().get(phonenumber) + "";
 
         SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
@@ -68,7 +72,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 +96,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());
@@ -136,6 +140,7 @@
 
     @Override
     public List<SysUser> selectListByDepartmentId(String departmentId, String classifyId) {
+        baseMapper.setGroup();
         List<String> departmentIds=new ArrayList<>();
         departmentIds.add(departmentId);
         List<OrganizationChartEntity> organizationChartEntities = organizationChartMapper.selectList(new QueryWrapper<OrganizationChartEntity>().lambda()
@@ -152,12 +157,13 @@
         if (classifyId==null)
             return baseMapper.selectListByDepartmentId(departmentIds,null,null);
         else
-             return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+            return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
     }
 
     @Override
     public ResultData loginByPhonenumber(String phonenumber)
     {
+        baseMapper.setGroup();
         SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
         if (sysUser==null){
             //查询花城e+是否存在此用户
@@ -238,7 +244,13 @@
 
     @Override
     public List<SysUser> queryList(Integer userType,String keyWord) {
+        baseMapper.setGroup();
         return baseMapper.queryList(userType,keyWord);
+    }
+
+    @Override
+    public void setGroup() {
+        baseMapper.setGroup();
     }
 
     public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -254,12 +266,14 @@
     }
 
     @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) {
+        baseMapper.setGroup();
+        return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
     }
 
     @Override
     public SysUser selectData(String userId,String phonenumber,String loginName) {
+        baseMapper.setGroup();
         return baseMapper.selectData(userId,phonenumber,loginName);
     }
 
@@ -298,8 +312,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