新增加功能

Pu Zhibing

2025-04-17 f4e12a183070e9fc1db174dfb7f1c9a59f7763a1

 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java

@@ -1,10 +1,16 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.modular.system.model.Invite;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.dao.TUserMapper;
import com.stylefeng.guns.modular.system.service.IInviteService;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.stylefeng.guns.modular.system.service.ITUserService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -20,10 +26,17 @@
 */
@Service
public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ITUserService {
    
    @Autowired
    private IInviteService inviteService;
    
    @Autowired
    private ITDriverService driverService;

    @Override
    public List<Map<String, Object>> getUserList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer roleType,Integer nowUserId, Integer isAuth, Integer state, String id, String nickName,String phone,String companyName) {
        return this.baseMapper.getUserList(page, beginTime, endTime,roleType,nowUserId, isAuth, state, id, nickName,phone,companyName);
    public List<Map<String, Object>> getUserList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer roleType,Integer nowUserId, Integer isAuth,
                                                 Integer state, String id, String nickName,String phone,String companyName, String inviteUser) {
        return this.baseMapper.getUserList(page, beginTime, endTime,roleType,nowUserId, isAuth, state, id, nickName,phone,companyName, inviteUser);
    }

    @Override
@@ -33,6 +46,32 @@

    @Override
    public List<Map<String, Object>> getUserListNoPage(Integer roleType, Integer nowUserId) {
        return this.baseMapper.getUserListNoPage(roleType, nowUserId);
        List<Map<String, Object>> userListNoPage = this.baseMapper.getUserListNoPage(roleType, nowUserId);
        for (Map<String, Object> map : userListNoPage) {
            String string = map.get("id").toString();
            Invite invite = inviteService.selectOne(new EntityWrapper<Invite>().eq("userId", string));
            if(null != invite){
                String inviteUser1 = "";
                if(1 == invite.getUserType()){
                    TUser tUser = this.selectById(invite.getInviteUserId());
                    if(null != tUser){
                        inviteUser1 = tUser.getPhone();
                    }
                }else{
                    TDriver tDriver = driverService.selectById(invite.getInviteUserId());
                    if(null != tDriver){
                        inviteUser1 = tDriver.getPhone();
                    }
                }
                map.put("inviteUser", inviteUser1);
            }
        }
        
        return userListNoPage;
    }

    @Override
    public List<Map<String, Object>> inviteList(Page<Map<String, Object>> page, String startTime, String endTime, String inviteName, Integer uid) {
        return this.baseMapper.inviteList(page, startTime, endTime,inviteName,uid);
    }
}