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

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

@@ -276,7 +276,7 @@ function DepartMentTabCon(props) {
         onChangeSelectDep={(record)=>{setSelectDep(record);}}
       />
       <div className="table-con">
-        {props.currentTab === "departMentTab" && (
+        {(props.currentTab === "departMentTab" && selectDep.id !== '100') && (
           <div className="operate-area">
             <Button
               type="primary"
@@ -302,7 +302,7 @@ function DepartMentTabCon(props) {
           props.currentTab === "customGroupTab") && (
           <div className="operate-area">
             {/* 岗位组和自定义分组只有岗位下和分组才展示添加学员*/}
-            {selectDep.depLevel > 0 &&
+            {(selectDep.depLevel > 0) &&
               <Button
                 type="primary"
                 className="add-user-btn"

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

@@ -243,9 +243,11 @@ function LeftStructureTree(props) {
           </span>
         </Menu.Item>
       }
-      <Menu.Item key="del">
-        <span onClick={()=>{props.treeType==='postGrouptab'?delPostGroup(record):delCustomGroup(record)}}>删除</span>
-      </Menu.Item>
+      { (record.departmentCount === 0 || !record.departmentCount) &&
+        <Menu.Item key="del">
+          <span onClick={()=>{props.treeType==='postGrouptab'?delPostGroup(record):delCustomGroup(record)}}>删除</span>
+        </Menu.Item>
+      }
     </Menu>
   );