Merge branch 'feature/zhangleyuan/20210719/personnel-organization' into dev

src/modules/college-manage/components/LeftStructureTree.jsx

@@ -85,7 +85,8 @@ function LeftStructureTree(props) {
     </AutoComplete>
     </AutoComplete>
   );
   );
 
 
-  function confirmSearchSelect(value){
+  function confirmSearchSelect(value,option){
+    console.log('option',option);
     setOpen(false);
     setOpen(false);
     setQueryName(value);
     setQueryName(value);
     props.searchUserList({queryName:value},treeType,1);
     props.searchUserList({queryName:value},treeType,1);

src/modules/college-manage/components/MemberTree.jsx

@@ -27,7 +27,7 @@ function MemberTree(props) {
       params.departmentId = props.departmentId;
       params.departmentId = props.departmentId;
     }
     }
     if(props.nowTreeDepType){
     if(props.nowTreeDepType){
-      params.nowTreeDepType = props.nowTreeDepType;
+      params.nowDepType = props.nowTreeDepType;
     }
     }
     StoreService.getDepartmentUserNotPage(params).then((res) => {
     StoreService.getDepartmentUserNotPage(params).then((res) => {
       let { departmentVOList=[]} = res.result;
       let { departmentVOList=[]} = res.result;