Commit 4b304ee8 by zhangleyuan

feat:解决合并代码后的冲突

parents 48426937 4daf20a2
...@@ -190,11 +190,11 @@ function DepartMentTabCon(props) { ...@@ -190,11 +190,11 @@ function DepartMentTabCon(props) {
idList, idList,
storeId:User.getStoreId() storeId:User.getStoreId()
} }
console.log('selectDep',selectDep); console.log('selectDep',selectDep)
if(selectDep.id===100){ if(selectDep.id==='100'){
params.userType='WE_CHAT'; params.userType='WE_CHAT';
}else{ }else{
params.userType='WORK_WE_CHAT' params.userType='WORK_WE_CHAT';
} }
StoreService.delDepartmentUser(params).then((res) => { StoreService.delDepartmentUser(params).then((res) => {
message.success(`删除成功`); message.success(`删除成功`);
...@@ -270,7 +270,7 @@ function DepartMentTabCon(props) { ...@@ -270,7 +270,7 @@ function DepartMentTabCon(props) {
<LeftStructureTree <LeftStructureTree
treeType={props.currentTab} treeType={props.currentTab}
searchUserList={(params,treeType) => getUserList(params,treeType,1)} searchUserList={(params,treeType) => getUserList(params,treeType,1)}
onChangeSelectDep={(record)=>{setSelectDep(record)}} onChangeSelectDep={(record)=>{setSelectDep(record);}}
/> />
<div className="table-con"> <div className="table-con">
{props.currentTab === "departMentTab" && ( {props.currentTab === "departMentTab" && (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment