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

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

@@ -71,17 +71,30 @@ function DepartMentTabCon(props) {
     },
     },
     {
     {
       title: "岗位",
       title: "岗位",
-      dataIndex: "depPostNameList",
+      dataIndex: "depNameList",
       render: (val, record) => {
       render: (val, record) => {
-        if(!record.depPostNameList){
-          return <span>-</span>
+        if(props.currentTab === "departMentTab"){
+          if(!record.depNameList){
+            return <span>-</span>
+          }else{
+            if(record.depNameList.length === 0){
+              return <span>-</span>
+            }
+            return  record.depNameList.map((item, index) => {
+              return <span><WWOpenDataCom type="departmentName" openid={item}/>{index!==record.depNameList.length-1 && <span>、</span>}</span>;
+            })
+          }
         }else{
         }else{
-          if(record.depPostNameList.length === 0){
+          if(!record.depPostNameList){
             return <span>-</span>
             return <span>-</span>
+          }else{
+            if(record.depPostNameList.length === 0){
+              return <span>-</span>
+            }
+            return  record.depPostNameList.map((item, index) => {
+              return <span>{item}{index!==record.depPostNameList.length-1 && <span>、</span>}</span>;
+            })
           }
           }
-          return  record.depPostNameList.map((item, index) => {
-            return <span>{item}{index!==record.depPostNameList.length-1 && <span>、</span>}</span>;
-          })
         }
         }
       }
       }
     },
     },