新增智能电表、空调管理

doum

3 天以前 7ec3683c8e41460f4bb0bd3a6677198742313e2b

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java

@@ -230,7 +230,7 @@
            throw new BusinessException(ResponseStatus.NO_ALLOW_LOGIN);
        }

        if(isDebug == null  || !isDebug){
        /*if(isDebug == null  || !isDebug){
            //验证 短信码
            SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
                    .eq(SmsEmail::getType, Constants.ZERO)
@@ -254,7 +254,7 @@
            model.setStatus(Constants.ONE);
            model.setEditDate(new Date());
            smsEmailMapper.updateById(model);
        }
        }*/

        Company company = new Company();
        if(Objects.nonNull(user.getCompanyId())){
@@ -273,6 +273,7 @@
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));

        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        userInfo.setH5UserType(LoginUserInfo.H5_USER_OPS);
        return  userInfo;
    }

@@ -353,6 +354,7 @@
        user.setCompanyIdList(systemDataPermissionService.selectHighRole(new SystemDataPermission(),rt,user));

        LoginUserInfo userInfo = LoginUserInfo.from(user, roles, permissions,company,null);
        userInfo.setH5UserType(LoginUserInfo.H5_USER_OPS);
        String token = jwtTokenUtil.generateToken(userInfo);

        return  token;