feat:处理合并代码后的冲突

src/modules/college-manage/EmployeeManage.tsx

@@ -189,7 +189,7 @@ function EmployeeManage() {
           //   return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>;
           //   return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>;
           // })
           // })
           return <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
           return <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
-            return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>
+            return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?'；':''}</span>
             })}
             })}
           </div>
           </div>
           </Tooltip>
           </Tooltip>
@@ -246,7 +246,7 @@ function EmployeeManage() {
 
 
   function handleDepName(depArray:any):any{
   function handleDepName(depArray:any):any{
     const depArrayDom = depArray.map((item:any, index:any) => {
     const depArrayDom = depArray.map((item:any, index:any) => {
-    return <WWOpenDataCom type="departmentName" openid={item}/>
+    return <span><WWOpenDataCom type="departmentName" openid={item}/>；</span>
     });
     });
     return depArrayDom;
     return depArrayDom;
   };
   };
@@ -356,10 +356,10 @@ function EmployeeManage() {
       userType:'USER'
       userType:'USER'
     }
     }
     StoreService.syncWorkWeChatDepartment(params).then((res) => {
     StoreService.syncWorkWeChatDepartment(params).then((res) => {
+      getEmployeeList();
       message.success('已更新');
       message.success('已更新');
     });
     });
   }
   }
-
   return (
   return (
     <div className="page employee-manage-page">
     <div className="page employee-manage-page">
         <div className="content-header">角色管理</div>
         <div className="content-header">角色管理</div>

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

@@ -81,8 +81,8 @@ function DepartMentTabCon(props) {
             return <span>-</span>
             return <span>-</span>
           }
           }
           return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
           return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
-            return <span>{item}{index!==record.depNameList.length-1 && <span>;</span>}</span>
-          })}
+            return <span>{item}{index!==record.depNameList.length-1 && <span>；</span>}</span>
+            })}
           </div>
           </div>
           </Tooltip>
           </Tooltip>
         }
         }
@@ -128,7 +128,7 @@ function DepartMentTabCon(props) {
     let depStr = '';
     let depStr = '';
     depArray.forEach((item, index) => {
     depArray.forEach((item, index) => {
       if (index < depArray.length - 1) {
       if (index < depArray.length - 1) {
-        depStr = depStr + item + '、';
+        depStr = depStr + item + '；';
       } else {
       } else {
         depStr = depStr + item;
         depStr = depStr + item;
       }
       }

src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx

@@ -2,7 +2,7 @@
  * @Author: wufan
  * @Author: wufan
  * @Date: 2020-11-27 16:21:49
  * @Date: 2020-11-27 16:21:49
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-06 15:07:53
+ * @LastEditTime: 2021-08-06 17:10:50
  * @Description: Description
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -24,7 +24,7 @@ function AddOrEditPostGroupModal(props) {
     setIsError(false)
     setIsError(false)
     setValidateStatus('success');
     setValidateStatus('success');
     setNameErrorMsg('');
     setNameErrorMsg('');
-    if((!postGroupName) || /^\s+$/.test(postGroupName)){
+    if((!e.target.value) || /^\s+$/.test(e.target.value)){
       setValidateStatus('error');
       setValidateStatus('error');
       setNameErrorMsg(`${props.label}不能为空`);
       setNameErrorMsg(`${props.label}不能为空`);
       setIsError(true)
       setIsError(true)