处理登录 orgid 取值问题
This commit is contained in:
parent
2cf316bede
commit
7ea1063514
@ -45,6 +45,7 @@ class LoginPage extends React.Component {
|
||||
this.state = {
|
||||
treeData: [],
|
||||
tokenData: {},
|
||||
ORG_ID_WYW: '',//经常缓存有问题 添加一个做判断
|
||||
formData: {
|
||||
orgId: undefined,
|
||||
username: "",
|
||||
@ -120,6 +121,7 @@ class LoginPage extends React.Component {
|
||||
if (res && res.Data) {
|
||||
this.recurseData(res.Data);
|
||||
this.setState({
|
||||
ORG_ID_WYW: res.Data[0].Node.ORG_ID,
|
||||
treeData: res.Data,
|
||||
formData: {
|
||||
...this.state.formData,
|
||||
@ -181,7 +183,7 @@ class LoginPage extends React.Component {
|
||||
};
|
||||
|
||||
toLogin = (requestCode = false) => {
|
||||
const { tokenData, formData } = this.state;
|
||||
const { tokenData, formData, ORG_ID_WYW } = this.state;
|
||||
const { orgId, username, password, phoneCode } = formData;
|
||||
// this.props.dispatch({
|
||||
// type: "app/getDataByPost",
|
||||
@ -196,12 +198,19 @@ class LoginPage extends React.Component {
|
||||
// }
|
||||
// },
|
||||
// });
|
||||
|
||||
//wyw
|
||||
var Parameter4 = orgId
|
||||
if ((Parameter4 == undefined || Parameter4 == null) || (ORG_ID_WYW && ORG_ID_WYW.length > 0 && ORG_ID_WYW != Parameter4)) {
|
||||
Parameter4 = ORG_ID_WYW
|
||||
}
|
||||
|
||||
this.props.dispatch({
|
||||
type: "login/toLogin",
|
||||
payload: {
|
||||
Parameter1: username,
|
||||
Parameter2: MD5(password),
|
||||
Parameter4: orgId,
|
||||
Parameter4: Parameter4,// orgId,
|
||||
Parameter5: storage("lacal").getItem("formConfigVersion").val,
|
||||
Parameter6: requestCode,
|
||||
Parameter7: phoneCode,
|
||||
@ -231,13 +240,18 @@ class LoginPage extends React.Component {
|
||||
};
|
||||
|
||||
preLogin = () => {
|
||||
const { formData, verifyRandomCode } = this.state;
|
||||
const { formData, verifyRandomCode, ORG_ID_WYW } = this.state;
|
||||
const { orgId, username, password, verifyCode } = formData;
|
||||
//wyw
|
||||
var Parameter4 = orgId
|
||||
if ((Parameter4 == undefined || Parameter4 == null) || (ORG_ID_WYW && ORG_ID_WYW.length > 0 && ORG_ID_WYW != Parameter4)) {
|
||||
Parameter4 = ORG_ID_WYW
|
||||
}
|
||||
this.props
|
||||
.dispatch({
|
||||
type: "login/getToken",
|
||||
payload: {
|
||||
orgId,
|
||||
Parameter4,// orgId,
|
||||
username,
|
||||
password: MD5(password),
|
||||
grant_type: 0,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user