Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -49,13 +49,8 @@

    @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
@@ -147,7 +142,10 @@
                    departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
            }
        }
        return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
        if (classifyId==null)
            return baseMapper.selectListByDepartmentId(departmentIds,null,null);
        else
             return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
    }

    @Override
@@ -157,9 +155,9 @@
        if (sysUser==null){
            //查询花城e+是否存在此用户
            HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
            SysUser newUser = new SysUser();
            if(huaChengSysUser==null)
            {
                SysUser newUser = new SysUser();
                newUser.setUserId(Snowflake.getId());
                newUser.setLoginName(phonenumber);
                newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
@@ -172,7 +170,6 @@
            }
            else
            {
                SysUser newUser = new SysUser();
                newUser.setUserId(huaChengSysUser.getUserId());
                newUser.setLoginName(huaChengSysUser.getPhone());
                newUser.setUserName(huaChengSysUser.getNickName());
@@ -185,10 +182,25 @@
                newUser.setOpenid(huaChengSysUser.getOpenid());
                baseMapper.insertConfig(newUser);
            }
        }

        sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
        if (sysUser!=null) {
            String token = tokenManager.getTokenByUserId(newUser.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
            System.out.println("token " + token);
            if (token == null) {
                //生成一个token，保存用户登录状态
                token = tokenManager.createToken(newUser.getUserId(), newUser.getUserId());
            }

            Map<String, Object> map = new HashMap<>();
            map.put("token", token);
            map.put("userId", newUser.getUserId());
            map.put("userName", newUser.getUserName());

            return ResultData.success(map);

        }
        else
        {
            String token = tokenManager.getTokenByUserId(sysUser.getUserId());
//        String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
            System.out.println("token " + token);
@@ -208,8 +220,11 @@

            return ResultData.success(map);
        }
    }

        return ResultData.error("用户不存在");
    @Override
    public List<SysUser> queryList(Integer userType,String keyWord) {
        return baseMapper.queryList(userType,keyWord);
    }

    public  List<String> getDepartmentIds(  List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -225,13 +240,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) {
        return baseMapper.selectConfigList(page, state,userType,userName);
    }

    @Override
    public SysUser selectData(String userId) {
        return baseMapper.selectData(userId);
    public SysUser selectData(String userId,String phonenumber) {
        return baseMapper.selectData(userId,phonenumber);
    }


@@ -269,8 +284,8 @@
    }

    @Override
    public int selectNum(String userType) {
        return baseMapper.selectNum(userType);
    public int selectNum(String userType,String userName) {
        return baseMapper.selectNum(userType,userName);
    }