fix:合并人员组织架构分支代码

src/bu-components/ChooseMembersModal.less

@@ -21,7 +21,7 @@
       .container-left-body-table{
         width: 300px;
         height: 330px;
-
+        overflow: scroll;
         .ant-table {
           border: none;
           min-height: 250px !important;

src/common/js/platform.js

+
+module.exports = {
+    isWeiXin() {
+      const ua = navigator.userAgent.toLowerCase();
+      return ua.indexOf('micromessenger') > 0;
+    },
+    isWorkWx (){
+     return  /wxwork/i.test(navigator.userAgent)
+    },
+    isAlipay() {
+      const ua = navigator.userAgent.toLowerCase();
+      return ua.indexOf('aliapp') > 0 || ua.indexOf('alipay') > 0;
+    },
+  
+    isXiaoMaiApp() {
+      const ua = navigator.userAgent.toLowerCase();
+      return ua.match(/xiaomai_ios/i) === 'xiaomai_ios' || ua.match(/xiaomai_android/i) === 'xiaomai_android';
+    },
+  
+    isXiaoMaiIOSApp() {
+      const ua = navigator.userAgent.toLowerCase();
+      return ua.match(/xiaomai_ios/i) === 'xiaomai_ios';
+    },
+  
+    isXiaoMaiAndroidApp() {
+      const ua = navigator.userAgent.toLowerCase();
+      return ua.match(/xiaomai_android/i) === 'xiaomai_android';
+    },
+  
+    isAndroid() {
+      const ua = navigator.userAgent.toLowerCase();
+      return /android/i.test(ua);
+    },
+    isIOS() {
+      const ua = navigator.userAgent.toLowerCase();
+      return /iphone|ipad|ipod/i.test(ua);
+    },
+    isMeiKe() {
+      const ua = navigator.userAgent.toLowerCase();
+      return /xmappc/i.test(ua);
+    },
+  };
+  
\ No newline at end of file

src/common/js/wechatApi.js

+/*
+ * @Author: wufan
+ * @Date: 2021-05-11 10:21:37
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-19 15:24:27
+ * @Description: 企业微信api
+ * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
+ * 
+ */
+
+import Platform from '@/common/js/platform';
+import User from '@/common/js/user';
+import Service from '@/common/js/service';
+
+export default class WechatApi {
+  static async initConfig(params = { isAgentConfig: false, url: '' }) {
+    if (Platform.isWorkWx()) {
+
+      return new Promise(async (resolve, reject) => {
+        Service.Hades('anon/hades/getWxCorpJSAPISignature', {
+          storeId: User.getStoreId(),
+          url: params.url,
+        }).then((result) => {
+          const res = result.result;
+          this.config({
+            beta: true, // 必须这么写，否则wx.invoke调用形式的jsapi会有问题
+            debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+            appId: res.appId, // 必填，企业微信的corpID
+            timestamp: res.timestamp, // 必填，生成签名的时间戳
+            nonceStr: res.nonceStr, // 必填，生成签名的随机串
+            signature: res.signature, // 必填，签名，见 附录-JS-SDK使用权限签名算法
+            jsApiList: ['chooseImage', 'shareToExternalContact', 'selectExternalContact', 'selectEnterpriseContact'],
+          }).then(() => {
+            Service.Hades('anon/hades/getWxWorkJSAPISignature', {
+              storeId: User.getStoreId(),
+              url: params.url,
+            }).then((result2) => {
+              const res2 = result2.result;
+              this.agentConfig({
+                corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
+                agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
+                timestamp: res2.timestamp, // 必填，生成签名的时间戳
+                nonceStr: res2.nonceStr, // 必填，生成签名的随机串
+                signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
+                jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
+                success: (res) => {
+                  console.log(res, 'res-agentconfig');
+                  console.info('window.WWOpenData', window.WWOpenData);
+                  resolve(res);
+                },
+                fail: (err) => {
+                  console.log(1213545344545)
+                  console.log(err, 'err-agentconfig');
+                  reject(err);
+                },
+              });
+            });
+
+          })
+
+
+        });
+      })
+
+    } else {
+      if (params.isAgentConfig) {
+        console.log(32132132, 'cesgu')
+        return new Promise(async (resolve, reject) => {
+          Service.Hades('anon/hades/getWxWorkJSAPISignature', {
+            storeId: User.getStoreId(),
+            url: params.url,
+          }).then((result2) => {
+            const res2 = result2.result;
+            this.agentConfig({
+              corpid: res2.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
+              agentid: res2.agentid, // 必填，企业微信的应用id （e.g. 1000247）
+              timestamp: res2.timestamp, // 必填，生成签名的时间戳
+              nonceStr: res2.nonceStr, // 必填，生成签名的随机串
+              signature: res2.signature, // 必填，签名，见附录-JS-SDK使用权限签名算法
+              jsApiList: ['selectExternalContact', 'getCurExternalContact', 'getContext', 'shareToExternalContact', 'sendChatMessage', 'shareToExternalChat'],
+              success: (res) => {
+                console.log(res, 'res-agentconfig');
+                console.info('window.WWOpenData', window.WWOpenData);
+                resolve(res);
+              },
+              fail: (err) => {
+                console.log(1213545344545)
+                console.log(err, 'err-agentconfig');
+                reject(err);
+              },
+            });
+          });
+        });
+      }
+    }
+
+  }
+
+  static async config(config) {
+    return new Promise((resolve, reject) => {
+      console.info('wx.config', config);
+      wx.config(config);
+      wx.ready(resolve);
+      wx.error(reject);
+    }).then(
+      () => {
+        console.info('wx.ready');
+      },
+      (error) => {
+        console.error('wx.error', error);
+        throw error;
+      }
+    );
+  }
+
+  static async agentConfig(config) {
+    wx.agentConfig({ ...config });
+  }
+
+  static getCurExternalContact() {
+    return new Promise((resolve, reject) => {
+      wx.ready(() => {
+        wx.invoke('getCurExternalContact', {}, function (res) {
+          if (res.err_msg == 'getCurExternalContact:ok') {
+            resolve(res.userId); //返回当前外部联系人userId
+          } else {
+            reject(res.err_msg); //错误处理
+          }
+        });
+      });
+    });
+  }
+
+  static getContext() {
+    return new Promise((resolve, reject) => {
+      wx.ready(() => {
+        wx.invoke('getContext', {}, function (res) {
+          if (res.err_msg == 'getContext:ok') {
+            resolve(res.entry); //返回进入H5页面的入口类型，目前有normal、contact_profile、single_chat_tools、group_chat_tools、chat_attachment
+          } else {
+            reject(res.err_msg); //错误处理
+          }
+        });
+      });
+    });
+  }
+}

src/components/WWOpenData.jsx

+import React, { useRef, useLayoutEffect } from 'react'
+export default function WWOpenDataCom({ type, openid }) {
+    const ref = useRef(null)
+    useLayoutEffect(() => {
+        console.log('1111');
+        console.log(WWOpenData);
+        WWOpenData && WWOpenData.bind(ref.current)
+    })
+    return <ww-open-data ref={ref} type={type} openid={openid} />
+}
\ No newline at end of file

src/components/WWOpenDataCom.jsx

+import React, { useContext, useRef, useLayoutEffect } from 'react'
+import { XMContext } from '@/store/context';
+import WWOpenData from './WWOpenData'
+export default function WWOpenDataCom(props) {
+
+    const ctx = useContext(XMContext);
+    const ref = useRef(null)
+
+    return ctx.xmState.wechatLogin ? <WWOpenData  {...props} /> : <div></div>
+
+}
\ No newline at end of file

src/core/wechatApi.js

+import Platform from './platform';
+import Service from "@/common/js/service";
+import User from '@/common/js/user';
+
+export default class WechatApi {
+    static initShareConfig() {
+        // if (Platform.isWeiXin()) {
+        const data = { url: window.location.href.split('#')[0], storeId: User.getStoreId(), }
+        Service.Hades('anon/hades/getWxWorkJSAPISignature', data).then((result) => {
+            const res = result.result;
+            const conf ={ 
+                corpid: res.corpid, // 必填，企业微信的corpid，必须与当前登录的企业一致
+                agentid: res.agentid, // 必填，企业微信的应用id （e.g. 1000247）
+                timestamp: res.timestamp, // 必填，生成签名的时间戳
+                nonceStr: res.nonceStr,// 必填，生成签名的随机串
+                signature: res.signature,
+                jsApiList: ['startLiving','downloadLivingReplay'],
+                success: function(res) {
+                    console.log('agentConfig注册成功')
+                   console.log(res,'agentConfig')
+                },
+                fail: function(res) {
+                    console.log(res,' agentConfig1 错误')
+                    if(res.errMsg.indexOf('function not exist') > -1){
+                        alert('版本过低请升级')
+                    }
+                },
+                complete:(res)=>{
+                    console.log(res,' agentConfig2 错误')
+                }
+            }
+            console.log(conf)
+            
+            wx.agentConfig(conf);
+        });
+        // }
+    }
+
+}
\ No newline at end of file

src/data-source/store/request-apis.ts

 /*
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-09 10:28:03
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-30 17:00:06
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -75,6 +75,36 @@ export function updateStoreMessage(params: object) {
 export function getStoreDetail(params: object) {
   return Service.Hades("public/hades/getStoreDetail", params);
 }
-
-
-
+export function getByDepartmentId(params: object) {
+  return Service.Hades("public/hades/getByDepartmentId", params);
+}
+export function getDepartmentUser(params: object) {
+  return Service.Hades("/public/hades/getDepartmentAndDepartmentUserByName", params);
+}
+export function getDepartmentUserNotPage(params: object) {
+  return Service.Hades("public/hades/getDepartmentAndDepartmentUserNotPageByName", params);
+}
+export function addDepartment(params: object) {
+  return Service.Hades("public/hades/addDepartment", params);
+}
+export function editDepartment(params: object) {
+  return Service.Hades("public/hades/editDepartment", params);
+}
+export function delDepartment(params: object) {
+  return Service.Hades("public/hades/delDepartment", params);
+}
+export function queryDepartmentTree(params: object) {
+  return Service.Hades("public/hades/queryDepartmentTree", params);
+}
+export function getStoreCustomerAndDepNamePage(params: object) {
+  return Service.Hades("public/hades/getStoreCustomerAndDepNamePage", params);
+}
+export function delDepartmentUser(params: object) {
+  return Service.Hades("public/hades/delDepartmentUser", params);
+}
+export function syncWorkWeChatDepartment(params: object) {
+  return Service.Hades("public/hades/syncWorkWeChatDepartment", params);
+}
+export function getSyncCount(params: object) {
+  return Service.Hades("public/hades/getSyncCount", params);
+}

src/domains/store-domain/constants.ts

 /*
  * @Author: zhangleyuan
  * @Date: 2021-01-19 11:27:56
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-08 10:36:04
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-29 13:37:10
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -12,6 +12,7 @@ export const storeRoleEnum = {
     "1": "管理员",
     "2": "普通讲师"
 };
+
 export const industryList = ["IT服务","制造业","批发/零售","生活服务","文化/体育/娱乐业","建筑/房地产","教育","运输/物流/仓储","医疗","政府","金融","能源/采矿","农林渔牧","其他行业"];
 
 export const childIndustryList = {
@@ -30,3 +31,8 @@ export const childIndustryList = {
     "农林渔牧":["农林渔牧"],
     "其他行业":["科学研究和技术服务业","社会组织","水利和环境管理","国际组织","其他"]
 }
+export const DepType = {
+    'departMentTab':'DEP_ORG',
+    'postGrouptab':'DEP_POST',
+    'customGroupTab':'DEP_CUSTOM'
+}
\ No newline at end of file

src/domains/store-domain/storeService.ts

 /*
  * @Author: wufan
  * @Date: 2020-11-25 18:25:02
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-08 11:48:43
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-01 09:38:54
  * @Description: Description
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 import { getEmployeeList, getUserList, getStoreDecorationList, getStoreRole, addEmployee, editEmployee, deleteEmployee, getCourseCatalogList,
    getAllSonCategory, addCourseCategory, delCourseCategory, editCourseCategory, deleteStoreDecorationList, addStoreBanner, editStoreBanner,
-    moveBannerSequence,getStoreUserBasicPage,updateStoreMessage,getStoreDetail} from '@/data-source/store/request-apis';
+  moveBannerSequence,getStoreUserBasicPage,updateStoreMessage,getStoreDetail,getByDepartmentId,getDepartmentUser,getDepartmentUserNotPage,addDepartment,
+  editDepartment,delDepartment,queryDepartmentTree,getStoreCustomerAndDepNamePage,delDepartmentUser,syncWorkWeChatDepartment,getSyncCount
+  } from '@/data-source/store/request-apis';
 
 export default class StoreService {
   // 获取员工列表 
@@ -89,4 +91,37 @@ export default class StoreService {
   static getStoreDetail(params: any) {
     return getStoreDetail(params);
   }
+  static getByDepartmentId(params:any){
+    return getByDepartmentId(params);
+  }
+  static getDepartmentUser(params:any){
+    return getDepartmentUser(params);
+  }
+  static getDepartmentUserNotPage(params:any){
+    return getDepartmentUserNotPage(params);
+  }
+  static addDepartment(params:any){
+    return addDepartment(params);
+  }
+  static editDepartment(params:any){
+    return editDepartment(params);
+  }
+  static delDepartment(params:any){
+    return delDepartment(params);
+  }
+  static queryDepartmentTree(params:any){
+    return queryDepartmentTree(params);
+  }
+  static getStoreCustomerAndDepNamePage(params:any){
+    return getStoreCustomerAndDepNamePage(params);
+  }
+  static delDepartmentUser(params:any){
+    return delDepartmentUser(params);
+  }
+  static syncWorkWeChatDepartment(params:any){
+    return syncWorkWeChatDepartment(params);
+  }
+  static getSyncCount(params:any){
+    return getSyncCount(params);
+  }
 }
\ No newline at end of file

src/index.html

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-24 12:20:57
  * @LastEditors: yuananting
- * @LastEditTime: 2021-08-05 16:19:02
+ * @LastEditTime: 2021-08-05 19:50:10
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->
@@ -47,6 +47,8 @@
     <script type="text/javascript" src="https://image.xiaomaiketang.com/xm/PhotoClip.js"></script>
     <script type="text/javascript" charset="utf-8" src="//g.alicdn.com/sd/ncpc/nc.js?t=2015052012"></script>
     <script type="text/javascript" src="https://xiaomai-js.oss-cn-hangzhou.aliyuncs.com/loghub-xm-0.0.1-beta.js"></script>
+    <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+    <script type="text/javascript" src="//open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

src/modules/college-manage/EmployeeManage.less

@@ -5,4 +5,16 @@
     .add-show-btn{
         margin-top:12px;
     }
+    .update-user-btn{
+      margin-left:8px;
+      margin-right:8px;
+    }
+    .origin-text{
+        font-size:14px;
+        color:#999;
+    }
+    .view-text{
+        font-size:14px;
+        color:#5289FA;
+    }
 }
\ No newline at end of file

src/modules/college-manage/LimitTip.tsx

+/*
+ * @Author: your name
+ * @Date: 2021-08-04 15:21:36
+ * @LastEditTime: 2021-08-04 15:23:37
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: /xiaomai-cloud-class-web/src/modules/college-manage/LimitTip.tsx
+ */
 import React, { useContext, useEffect, useState } from "react";
 import { Tooltip } from "antd"
 import { VersionContext } from "@/store/context";
@@ -26,7 +34,7 @@ export default function LimitTip(props:{total:number,type:string,tip:() => React
         {
           isOver ? (
             <>
-            <div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 (<span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人)，将无法添加新员工、新学员，如需增加人数限制，请联系小麦企学院服务平台。</div>
+            <div style={{marginLeft:"14px",display:"inline-block"}}>当前企业使用人数已达到上限 <span style={{color:"#333333",fontWeight:"bold"}}>{limitUser}</span>人，将无法添加新员工、新学员，如需增加人数限制，请联系小麦企学院服务平台。</div>
             <ContactWidget trigger="hover" placement="bottom">
               <div className="renew-text">立即续费<span className="icon iconfont" style={{fontSize:"10px"}}>&#59291;</span></div>
             </ContactWidget>

src/modules/college-manage/NewUsersManagePage.jsx

+/*
+ * @Author: wufan
+ * @Date: 2020-11-30 10:47:38
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-03 16:04:30
+ * @Description: 学员管理页面
+ * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
+ */
+
+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import _ from "underscore";
+import {Tabs,Input,Tree,Button} from "antd";
+import CustomGroupTabCon from './components/CustomGroupTabCon';
+import DepartMentTabCon from './components/DepartMentTabCon';
+import PostGroupTabCon from './components/PostGroupTabCon';
+import "./NewUsersManagePage.less";
+
+const { TabPane } = Tabs;
+
+
+function UserManagePage() {
+  const [currentTab, setCurrentTab] = useState("departMentTab");
+  const [courseList,setCourseList] = useState([]);
+  const [total, setTotal] = useState(0);
+  const [query, setQuery] = useState({
+    current: 0,
+    size: 10,
+  });
+  
+  return (
+    <div className="page new-user-manage-page">
+        <div className="content-header">学员管理</div>
+        <div className="box">
+          <div className="tab-box">
+            <Tabs
+              onChange={(key) => {
+                setCurrentTab(key);
+              }}
+              activeKey={currentTab}
+            >
+              <TabPane key="departMentTab" tab="部门"></TabPane>
+              <TabPane key="postGrouptab" tab="岗位组"></TabPane>
+              <TabPane key="customGroupTab" tab="自定义分组"></TabPane>
+            </Tabs>
+          </div>
+          <div className="box-body tab-con">
+            <DepartMentTabCon currentTab={currentTab}/>
+          </div>
+        </div>
+    </div>
+  );
+}
+
+export default withRouter(UserManagePage);

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

+
+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { Button, Input, message } from "antd";
+import LeftStructureTree from "./LeftStructureTree";
+import AddOrEditPostGroupModal from "../modal/AddOrEditPostGroupModal";
+import UserTable from "./UserTable";
+
+import "./PostGroupTabCon.less";
+const { Search } = Input;
+function CustomGroupTabCon() {
+  const [postGroupTreeData, setPostGroupTreeData] = useState([]);
+  return (
+    <div className="post-group-tab-con">
+      <LeftStructureTree
+          treeData={postGroupTreeData}
+          treeType={"customGroupTab"}
+          editPostGroup={(record)=>editPostGroup(record)}
+          addPostGroup={(record)=>addPostGroup(record)}
+        />
+      <div className="table-con">
+        <div className="operate-area">
+          <Button type="primary" className="add-user-btn">
+            添加学员
+          </Button>
+          <Button className="del-user-btn">移出学员</Button>
+        </div>
+        <UserTable />
+      </div>
+    </div>
+  );
+}
+
+export default withRouter(CustomGroupTabCon);
+

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

+.department-tab-con{
+    display: flex;
+    .table-con{
+        margin-left:16px;
+        flex:1;
+        .post-name{
+          max-width: 200px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+        }
+        .operate-area{
+          margin-bottom:16px;
+          .add-user-btn{
+            margin-right:8px;
+          }
+          .del-user-btn{
+            margin-right:8px;
+          }
+          .update-user-btn{
+            margin-right:8px;
+          }
+          .origin-text{
+            font-size:14px;
+            color:#999;
+          }
+          .view-text{
+            font-size:14px;
+            color:#5289FA;
+          }
+        }
+        .operate{
+          .operate__item{
+            color:#2966FF;
+            cursor: pointer;
+          }
+        }
+      }
+}
\ No newline at end of file

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

+.left-structure-tree {
+    margin-right: 24px;
+    width:250px;
+    height: calc(~'100vh - 260px');
+    .organization{
+      overflow: scroll;
+      .search-con{
+        margin-bottom: 10px;
+      }
+      .operate {
+        margin-bottom:16px;
+        .add-btn {
+          width: 230px;
+          height:32px;
+        }
+      }
+    
+      &::-webkit-scrollbar {
+        display: none;
+      }
+      .node-title-div {
+        display: flex;
+        justify-content: space-between;
+        white-space: nowrap;
+        .item-icon {
+          img {
+            width: 16px;
+            height: 16px;
+          }
+        }
+        .item-title {
+          position: absolute;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          width: 55%;
+          left: 28px;
+        }
+        .item-more {
+          visibility: hidden;
+          position: absolute;
+          right: 8px;
+          text-align: right;
+        }
+        .item-count {
+          visibility: visible;
+          position: absolute;
+          right: 12px;
+          text-align: right;
+        }
+      }
+      // 修改树样式
+      .ant-tree .ant-tree-treenode {
+        padding: 10px 0 14px 0;
+      }
+      .ant-tree.ant-tree-directory {
+        .ant-tree-node-selected{
+          color:#2966FF !important;
+        }
+        .ant-tree-treenode-selected:hover::before,
+        .ant-tree-treenode-selected::before {
+          background: #f3f6fa;
+        }
+        .ant-tree-treenode-selected .ant-tree-switcher {
+          color: #666666;
+        }
+        .ant-tree-treenode .ant-tree-node-content-wrapper {
+          color: #666666;
+        }
+      }
+    }
+   
+  }
+  
\ No newline at end of file

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

+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { Tree} from "antd";
+import StoreService from "@/domains/store-domain/storeService";
+import User from '@/common/js/user';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
+import "./MemberTree.less";
+import _ from 'underscore';
+const { DirectoryTree } = Tree;
+function MemberTree(props) {
+  const [treeData,setTreeData]=useState([]);
+  useEffect(()=>{
+    getTreeData();
+  },[]);
+  function getTreeData(){
+    const params = {
+      depType:props.treeDepType,
+      enterpriseId:User.getEnterpriseId(),
+      source:0,//0代表来自企培
+      storeId:User.getStoreId(),
+      userId:User.getUserId(),
+      whetherCount:false,
+      distinct:true,
+      queryType:props.type
+    }
+    if(props.departmentId){
+      params.departmentId = props.departmentId;
+    }
+    if(props.nowTreeDepType){
+      params.nowDepType = props.nowTreeDepType;
+    }
+    StoreService.getDepartmentUserNotPage(params).then((res) => {
+      let { departmentVOList=[]} = res.result;
+      let _treeData = handleData(departmentVOList);
+      console.log("_treeData",_treeData);
+      setTreeData(_treeData);
+    });
+  }
+  function handleData(dataArray){
+    const _dataArray = dataArray.map((item,index)=>{
+      item.key=item.id;
+      item.children = []
+      if(item.departmentUserVOList){
+        item.children = item.departmentUserVOList;
+      }
+      if(item.sonDepartmentVOList){
+        item.children = [...item.children,...item.sonDepartmentVOList];
+      }
+      if(item.children.length > 0){
+        handleData(item.children)
+      }else{
+        delete item.children
+      }
+      return item
+    })
+    return _dataArray;
+  }
+  function treeSelected (selectedKeys,e){
+    const _checkedNodes = e.checkedNodes;
+    const _selectNodes = [];
+    _checkedNodes.map((item,index)=>{
+      if(item.userId){
+        _selectNodes.push(item);
+      }
+    })
+    console.log('_selectNodes',_selectNodes);
+    props.onSelect(_selectNodes);
+  }
+  return (
+    <div className="member-tree">
+      <div className="tree-con">
+        <DirectoryTree
+          defaultExpandAll
+          checkable
+          showIcon={false}
+          treeData={treeData}
+          checkedKeys={_.pluck(props.selectUserList, 'id')}
+          onCheck={(selectedKeys,e)=>treeSelected(selectedKeys,e)}
+          titleRender={(nodeData) => {
+            return (
+              <div
+                className="node-title-con"
+              >
+                {nodeData.userId ?
+                  <div>
+                    <span className="icon iconfont title-icon">&#xe603;</span>
+                    <span><WWOpenDataCom type="userName" openid={nodeData.userName}/></span>
+                  </div>
+                  :
+                  <div>
+                    <span className="icon iconfont title-icon">&#xe604;</span>
+                    <span><WWOpenDataCom type="departmentName" openid={nodeData.name}/></span>
+                  </div>
+                }
+              </div>
+            );
+          }}
+        />
+      </div>
+    </div>
+  );
+}
+
+export default withRouter(MemberTree);

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

+.member-tree{
+    .node-title-con{
+        color:#666;
+        font-size:14px;
+        .title-icon{
+            margin-right:8px;
+        }
+    }
+}
\ No newline at end of file

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

+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { Button, Input, message,Modal} from "antd";
+import LeftStructureTree from "./LeftStructureTree";
+import UserTable from "./UserTable";
+
+import "./PostGroupTabCon.less";
+const { Search } = Input;
+function PostGroupTabCon() {
+  // const [addOrEditPostGroupShow, setAddOrEditPostGroupShow] = useState(false);
+  // const [postGroupModalType, setPostGroupModalType] = useState(""); 
+  // const [operatePostGroupModalType,setOperatePostGroupModalType] = useState(""); 
+  // const [postGroupModalTitle,setPostGroupModalTitle] = useState("");
+  // const [postGroupModalLable,setPostGroupModalLable] = useState("");
+  const [postGroupTreeData, setPostGroupTreeData] = useState([]);
+  
+  // function closeAddOrEditPostGroupModal() {
+  //   setAddOrEditPostGroupShow(false);
+  // }
+
+  // //添加岗位组/岗位
+  // function addPostGroup(type) {
+  //   if (postGroupTreeData.length === 10) {
+  //     message.error("岗位组数量已达10个上限");
+  //     return;
+  //   }
+  //   setAddOrEditPostGroupShow(true);
+  //   setOperatePostGroupModalType("add");
+  //   if(type==='parentGroup'){
+  //     setPostGroupModalType('parentGroup'); //parentGroup 代表岗位组
+  //     setPostGroupModalTitle('添加岗位组');
+  //     setPostGroupModalLable('岗位组');
+  //   }else{
+  //     setPostGroupModalType('sub');
+  //     setPostGroupModalTitle('添加岗位'); // sub代表岗位
+  //     setPostGroupModalLable('岗位');
+  //   }
+  // }
+
+  // //编辑岗位组/岗位
+  // function editPostGroup(record){
+  //   setAddOrEditPostGroupShow(true);
+  //   setOperatePostGroupModalType("edit");
+  //  //level为0的时候编辑的是岗位组 大于0的时候
+  //  if(record.level===0){
+  //   setPostGroupModalType('parentGroup');
+  //   setPostGroupModalTitle('编辑岗位组');
+  //   setPostGroupModalLable('岗位组');
+  //  }else{
+  //   setPostGroupModalType('sub');
+  //   setPostGroupModalTitle('编辑岗位');
+  //   setPostGroupModalLable('岗位');
+  //  }
+  // }
+
+  // function delPostGroup(record){
+  //  let title = '确认删除该岗位组吗？';
+  //  let content= '删除后，该岗位组下的岗位及也将全部删除。';
+  
+  //  if(record.level>0){
+  //    title = '确认删除该岗位吗？';
+  //    content = '删除后，不可恢复';
+  //  }
+  //   Modal.confirm({
+  //     title,
+  //     content,
+  //     icon: <span className='icon iconfont default-confirm-icon'>&#xe6f4;</span>,
+  //     okText: '确定',
+  //     okType: 'danger',
+  //     cancelText: '取消',
+  //     onOk: () => {
+        
+  //     },
+  //   });
+  // }
+
+  // function confirmAddOrEditPostGroup() {
+  //    getPostGroupTreeData()
+  // }
+  
+  return (
+    <div className="post-group-tab-con">
+      {/* <div className="organization">
+        <div className="search-con">
+          <Search
+            placeholder="搜索部门/学员姓名"
+            className="search search-input"
+            style={{ width: 245 }}
+            enterButton={<span className="icon iconfont">&#xe832;</span>}
+          />
+        </div>
+        <div className="operate">
+          <Button
+            className="add-btn"
+            onClick={() => {
+              addPostGroup('postGroup');
+            }}
+          >
+            添加岗位组
+          </Button>
+        </div>
+       
+      </div> */}
+      <LeftStructureTree
+        treeData={postGroupTreeData}
+        treeType={"postGrouptab"}
+        editPostGroup={(record)=>editPostGroup(record)}
+        addPostGroup={(record)=>addPostGroup(record)}
+        delPostGroup={(record)=>delPostGroup('record')}
+      />
+      <div className="table-con">
+        <div className="operate-area">
+          <Button type="primary" className="add-user-btn">
+            添加学员
+          </Button>
+          <Button className="del-user-btn">移出学员</Button>
+        </div>
+        <UserTable />
+      </div>
+      {/* {addOrEditPostGroupShow && (
+        <AddOrEditPostGroupModal
+          onClose={() => {
+            closeAddOrEditPostGroupModal();
+          }}
+          onConfirm={() => {
+            confirmAddOrEditPostGroup();
+          }}
+          title={postGroupModalTitle}
+          modalType={postGroupModalType}
+          modalOperateType={operatePostGroupModalType}
+          postGroupName={postGroupName}
+          postGroupTreeData={postGroupTreeData}
+          label={postGroupModalLable}
+        />
+      )} */}
+    </div>
+  );
+}
+
+export default withRouter(PostGroupTabCon);

src/modules/college-manage/components/PostGroupTabCon.less

+.post-group-tab-con {
+  display: flex;
+  .table-con {
+    margin-left: 16px;
+    flex: 1;
+    .operate-area {
+      margin-bottom: 16px;
+      .add-user-btn {
+        margin-right: 8px;
+      }
+      .del-user-btn {
+        margin-right: 8px;
+      }
+      .update-user-btn {
+        margin-right: 8px;
+      }
+      .origin-text {
+        font-size: 14px;
+        color: #999;
+      }
+      .view-text {
+        font-size: 14px;
+        color: #5289fa;
+      }
+    }
+  }
+}

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

+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { Input,Checkbox} from "antd";
+import StoreService from "@/domains/store-domain/storeService";
+import User from '@/common/js/user';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
+import $  from 'jquery';
+import './SearchUser.less'
+const { Search } = Input;
+function SearchUser(props) {
+  const [dropDownVisible,setDropDownVisible]=useState(false);
+  useEffect(()=>{
+    documentClick();
+  },[])
+  function onFocus(e){
+    setDropDownVisible(true);
+  }
+
+  function onChange(e){
+    props.onChange(e.target.value)
+  }
+  function selectuser(e,item){
+    if(e.target.checked){
+      let _record = []
+      _record.push(item)
+      props.onSelect(_record,'user')
+    }
+  }
+  function selectDep(e,item){
+    if(e.target.checked){
+      console.log('item',item);
+      props.onSelect(item,'department');
+    }
+  }
+  function  documentClick(){
+    document.onclick = function (e) {
+      let _con =$('#search-user');
+      if(!_con.is(e.target) && _con.has(e.target).length === 0){
+        setDropDownVisible(false);
+      }
+    };
+  }
+
+  return (
+    <div className="search-user" style={{width:'300px'}} id="search-user">
+        <Search 
+          placeholder='搜索成员'
+          enterButton={<span className="icon iconfont">&#xe832;</span>}
+          onFocus={(e)=>{onFocus(e)}}
+          onChange={(e)=>{onChange(e)}}
+          className="search-input-item"
+          // onBlur={()=>{onBlur()}}
+        />
+        {dropDownVisible && 
+        <div className="drop-down">
+              <div className="drop-down__list">
+                 {props.data.departmentUserVOList &&
+                  <div>
+                    <div className="drop-down__item__title">
+                        员工 
+                    </div>
+                    <div className="drop-down__item__con">
+                      <div>
+                        {props.data.departmentUserVOList.map((item,index)=>{
+                          return  <div>
+                            <Checkbox onChange={(e)=>{selectuser(e,item)}} >
+                                <div className="drop-down__item__con__item">
+                                  <div className="drop-down__item__con__item__left">
+                                    <span className="icon iconfont title-icon">&#xe603;</span>
+                                    <WWOpenDataCom type="userName" openid={item.userName}/>
+                                  </div>
+                                  <div className="drop-down__item__con__item__right">
+                                    {item.depNamesList.map((_item,index)=>{
+                                      return <span> <WWOpenDataCom type="departmentName" openid={_item}/>{index<(item.depNamesList.length -1)?';':''}</span>
+                                      })
+                                    }
+                                  </div>
+                                </div>
+                          </Checkbox>
+                          </div>
+                        })
+                        }
+                      </div>
+                    </div>
+                  </div>
+                }
+                {props.data.departmentVOList &&
+                  <div>
+                    <div className="drop-down__item__title">
+                        部门
+                    </div>
+                    <div className="drop-down__item__con">
+                      <div>
+                        {props.data.departmentVOList.map((item,index)=>{    
+                          return  <div><Checkbox onChange={(e)=>{selectDep(e,item)}}>
+                                      <div className="drop-down__item__con__item">
+                                      <div className="drop-down__item__con__item__left">
+                                      <WWOpenDataCom type="departmentName" openid={item.name}/>
+                                      </div>
+                                    </div>
+                                </Checkbox>
+                            </div>
+                        })
+                        }
+                      </div>
+                    </div>
+                  </div>
+                }
+                {(!props.data.departmentUserVOList && !props.data.departmentVOList)&&
+                  <div>暂无数据</div>
+                }
+              </div>
+        </div>
+        }
+    </div>
+  );
+}
+
+export default withRouter(SearchUser);

src/modules/college-manage/components/SearchUser.less

+.search-user{
+    position: relative;
+    padding:12px 16px;
+    .drop-down{
+        padding:18px;
+        position: absolute;
+        background: #FFF;
+        z-index:100001;
+        background: #FFFFFF;
+        box-shadow: 0px 2px 15px 6px rgba(0, 0, 0, 0.05);
+        border-radius:2px;
+        width:270px;
+        .ant-checkbox-wrapper{
+            width:100%;
+            .drop-down__item__con__item{
+                display:flex;
+                width:220px;
+                justify-content:space-between;
+                color:#333;
+                font-size:14px;
+                .drop-down__item__con__item__right{
+                    width:84px;
+                    text-align:right;
+                    overflow: hidden; 
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    color:#999;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

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

+import React, { useEffect, useState } from "react";
+import { withRouter } from "react-router-dom";
+import { XMTable,PageControl} from '@/components';
+import college from '@/common/lottie/college.json';
+import "./UserTable.less";
+
+function UserTable() {
+    const [courseList,setCourseList] = useState([]);
+    const [total, setTotal] = useState(0);
+    const [query, setQuery] = useState({
+        current: 0,
+        size: 10,
+    });
+    const columns = [
+        {
+        title: '学员',
+        dataIndex: 'user',
+        width:220,
+        render: (val, record) => {
+            return <span>{val}</span>
+        }
+        },
+        {
+        title: '真实姓名',
+        dataIndex: 'nickname',
+        width:'15%',
+        render: (val,record) => {
+            return  <span>{val}</span>
+            
+        }
+        },
+        {
+        title: '账号',
+        dataIndex: 'account',
+        width:'15%',
+        render: (val,record) => {
+            return <span>{val}</span>
+        }
+        },
+        {
+        title: '岗位',
+        dataIndex: 'post',
+        render: (val, record) => {
+            return <span className="post-name">{val}</span>
+        }
+        },
+        {
+        title: '手机号',
+        dataIndex: 'phone',
+        render: (val, record) => {
+            return <span>{val}</span>;
+        }
+        },
+        {
+        title: '注册时间',
+        dataIndex: 'registerTime',
+        render: (val, record) => {
+            return <span>{val}</span>;
+        }
+        },
+        {
+        title: "操作",
+        key: "operate",
+        dataIndex: "operate",
+        render: (val, record) => {
+            return (
+            <div className="operate">
+                <div
+                className="operate__item"
+                >
+                删除
+                </div>
+            </div>
+            )
+        }
+        },
+    ];
+    return (
+        <div className="user-table">
+            <XMTable
+                renderEmpty={{
+                image: college,
+                description: '暂无数据',
+                }}
+                bordered
+                size='middle'
+                pagination={false}
+                columns={columns}
+                scroll={{ x: 1300 }}
+                dataSource={courseList}
+            />
+            <div className='box-footer'>
+                <PageControl
+                    current={query.current}
+                    pageSize={query.size}
+                    total={total}
+                    toPage={(page) => {
+                    const queryStates = _.clone(query);
+                    queryStates.current = page;
+                    setQuery(queryStates);
+                    }}
+                />
+            </div>
+        </div>
+    );
+}
+
+export default withRouter(UserTable);
\ No newline at end of file

src/modules/college-manage/components/UserTable.less

+.user-table{
+   .post-name{
+        max-width: 100px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+   }
+} 
+ 
\ No newline at end of file

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

+/*
+ * @Author: wufan
+ * @Date: 2020-11-27 16:21:49
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-03 17:23:40
+ * @Description: Description
+ * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
+ */
+import React, { useState, useEffect } from "react";
+import { Modal,Form,Input,Button,message} from "antd";
+import User from '@/common/js/user';
+import StoreService from "@/domains/store-domain/storeService";
+import { DepType }  from '@/domains/store-domain/constants';
+import './AddOrEditPostGroupModal.less'
+function AddOrEditPostGroupModal(props) {
+  const [nameErrorMsg,setNameErrorMsg] = useState('');
+  const [validateStatus,setValidateStatus] = useState('success');
+  const [postGroupName,setPostGroupName] = useState('');
+  useEffect(() => {
+    
+  },[]);
+  function changePostGroupName(e){
+    let isError = false;
+    setValidateStatus('success');
+    setNameErrorMsg('');
+    props.postGroupTreeData.map((item,index)=>{
+        if(item.name === e.target.value){
+          setValidateStatus('error');
+          setNameErrorMsg(`该${props.label}已存在`);
+          isError = true;
+        }
+        return item;
+    })
+    if(!isError){
+      setPostGroupName(e.target.value);
+    }
+  }
+
+  function handleConfirm(){
+    if(props.modalOperateType === 'add'){
+      addGroup();
+    }else{
+      editGroup();
+    }
+  }
+  function addGroup(){
+    if(!postGroupName){
+      return;
+    }
+    const { postGroupModalLevel,currentTab,currentGroupData,label} = props
+    let parmas={
+      depLevel:postGroupModalLevel,
+      depType:DepType[currentTab],
+      departmentName:postGroupName,
+      enterpriseId:User.getEnterpriseId(),
+      source:0,
+      storeId:User.getStoreId(),
+      userId:User.getUserId()
+    }
+    if(postGroupModalLevel===0){
+      parmas.parentId = 0;
+    }else{
+      parmas.parentId = currentGroupData.id
+    }
+    StoreService.addDepartment(parmas).then((res) => {
+      message.success(`${label}创建成功`)
+      props.onConfirm();
+    });
+  }
+  function editGroup(){
+    if(!postGroupName){
+      return;
+    }
+    const {postGroupModalLevel,currentTab,currentGroupData,label} = props
+    let parmas={
+      departmentLevel:postGroupModalLevel,
+      departmentId:currentGroupData.id,
+      depType:DepType[currentTab],
+      departmentName:postGroupName,
+      enterpriseId:User.getEnterpriseId(),
+      source:0,
+      storeId:User.getStoreId(),
+      userId:User.getUserId()
+    }
+    if(postGroupModalLevel===0){
+      parmas.parentId = 0;
+    }else{
+      parmas.parentId = currentGroupData.parentId
+    }
+    StoreService.editDepartment(parmas).then((res) => {
+      message.success(`${label}修改成功`)
+      props.onConfirm();
+    });
+  }
+  return (
+    <Modal
+      visible={true}
+      title={props.title}
+      className="add-edit-post-group-modal"
+      onCancel={props.onClose}
+      width={448}
+      footer={[
+        <Button
+            id='cancel_allot_btn'
+            key="back" onClick={props.onClose}>取消</Button>,
+        <Button
+            id='confirm_allot_btn'
+            key="submit"
+            type="primary"
+            onClick={() => {
+                handleConfirm()
+            }}>
+            保存
+        </Button>
+      ]}
+      maskClosable={false}
+      closeIcon={<span className="icon iconfont modal-close-icon">&#xe6ef;</span>}
+    >
+     <Form
+        labelCol={ {span:5 }}
+     >
+        <Form.Item
+            // label={`${props.label}名称`}
+            name={`${props.label}名称`}
+            rules={[{ required: true}]}
+            validateStatus={validateStatus}
+            help={nameErrorMsg}
+        >
+        <Input type="text" placeholder={`请输入${props.label}名称（8个字以内）`} maxLength={8} style={{ width: 348 }}  
+            defaultValue={props.modalOperateType==='edit'?props.currentGroupData.name:''}
+            onChange={(e) => { 
+            changePostGroupName(e);
+        }} />
+      </Form.Item>
+     </Form>
+    </Modal>
+  );
+}
+
+export default AddOrEditPostGroupModal;

src/modules/college-manage/modal/ChooseMembersModal.less

@@ -23,7 +23,7 @@
         .container-left-body-table{
           width: 300px;
           height: 330px;
-  
+          overflow: scroll;
           .ant-table {
             border: none;
             min-height: 250px !important;

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

 import React from 'react';
 import { Modal, Button, Radio, Tooltip } from 'antd';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import './SetEmployeeModal.less'
 
 const RadioGroup = Radio.Group;
@@ -13,13 +14,13 @@ export default class SetEmployeeModal extends React.Component {
   constructor(props) {
     super(props);
     const list = props.list.map(item => {
-      item.roleCode = (props.selectObject || {})[item.enterpriseVisibleUserId] || (item.enterpriseRole === 'ADMIN' ? 'Cloud_Manager' : 'Cloud_Lecturer');
+      item.roleCode = (props.selectObject || {})[item.userId] || (item.enterpriseRole === 'ADMIN' ? 'Cloud_Manager' : 'Cloud_Lecturer');
       return item;
     })
     const selectedData = list[0] || {};
     this.state = {
       list,
-      selected: selectedData.enterpriseVisibleUserId,
+      selected: selectedData.userId,
       roleCode: selectedData.roleCode,
     }
   }
@@ -27,7 +28,7 @@ export default class SetEmployeeModal extends React.Component {
   handleChangeValues(value) {
     const { list, selected } = this.state;
     list.map((item) => {
-      if (item.enterpriseVisibleUserId === selected) {
+      if (item.userId === selected) {
         item.roleCode = value;
       }
     })
@@ -62,15 +63,18 @@ export default class SetEmployeeModal extends React.Component {
           <div className="employee-box">
             {list.map((item) => (
               <div
-                className={`item ${selected === item.enterpriseVisibleUserId ? ' selected' : ''}`}
-                key={item.enterpriseVisibleUserId}
+                className={`item ${selected === item.userId ? ' selected' : ''}`}
+                key={item.userId}
                 onClick={() => {
-                  this.setState({ selected: item.enterpriseVisibleUserId, roleCode: item.roleCode })
+                  this.setState({ selected: item.userId, roleCode: item.roleCode })
                 }}
               >
                 <span className="icon iconfont avatar-icon">&#xe84a;</span>
                 <Tooltip title={item.name}>
-                  <span className='name'>{item.name}</span>
+                  <span className='name'>
+                    {/* {item.userName} */}
+                    <WWOpenDataCom type="userName" openid={item.userName}/>
+                  </span>
                 </Tooltip>
                 <span className="tag">{tagMap[item.roleCode]}</span>
             </div>

src/modules/personalInfo/index.less

@@ -3,7 +3,7 @@
             padding: 24px 60px 60px 40px !important;
         }
         .label{
-            width:84px;
+            width:100px;
             text-align:right;
             font-size: 14px;
             color: #666666;
@@ -37,10 +37,10 @@
                     color:#FFF;
                     font-size:22px;
                 }
-                &:hover{
-                    display: inline-block;
-                    opacity:0.5;
-                }
+                // &:hover{
+                //     display: inline-block;
+                //     opacity:0.5;
+                // }
             }
         }
         .name-item{
@@ -58,7 +58,8 @@
             }
         }
         .save-btn {
-            margin-left: 92px;
+            margin-top:20px;
+            margin-left: 106px;
         }
 
 }
\ No newline at end of file

src/modules/personalInfo/index.tsx

 /*
  * @Author: zhangleyuan
  * @Date: 2020-11-27 15:06:31
- * @LastEditors: wufan
- * @LastEditTime: 2021-05-28 15:31:06
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-08-05 10:26:25
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
@@ -17,6 +17,7 @@ import IdentificationModal from "./IdentificationModal";
 import ChangePhoneModal from "./ChangePhoneModal";
 import BaseService from "@/domains/basic-domain/baseService";
 import StoreService from "@/domains/store-domain/storeService";
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import User from "@/common/js/user";
 import "./index.less";
 import { XMContext } from "@/store/context";
@@ -35,7 +36,7 @@ function PersonalInfoPage() {
   const [roleCodes, setRoleCodes] = useState([]);
   const [phone, setPhone] = useState("");
   const [weChatAccount, setWeChatAccount] = useState("");
-
+  const [departmentList,setDepartmentList] = useState([]);
   const storeUserId = User.getStoreUserId();
   const ctx: any = useContext(XMContext);
   const userId = User.getUserId();
@@ -51,11 +52,12 @@ function PersonalInfoPage() {
       storeUserId: User.getStoreUserId(),
     };
     BaseService.getStoreUser(param).then((res) => {
-      const { nickName, phone, roleCodes, weChatAccount } = res.result;
+      const { nickName, phone, roleCodes, weChatAccount,depNameList=[]} = res.result;
       setNickName(nickName);
       setPhone(phone);
       setRoleCodes(roleCodes);
       setWeChatAccount(weChatAccount);
+      setDepartmentList(depNameList)
       if (res.result.avatar) {
         setAvatar(res.result.avatar);
       }
@@ -122,7 +124,6 @@ function PersonalInfoPage() {
     setPhone(phone);
   }
 
-console.log('User.getStoreType()',User.getStoreType());
   return (
     <div className="page personal-info-page">
         <div className="content-header">个人设置</div>
@@ -130,18 +131,7 @@ console.log('User.getStoreType()',User.getStoreType());
           <Form>
             <div className="avatat-item">
               <span className="label">头像：</span>
-              <input
-                type="file"
-                accept="image/*"
-                value={""}
-                id="CrpperAvatarPic"
-                style={{ display: "none" }}
-                onChange={_handleUpdateAvatar}
-              />
               <img className="avatar" src={avatar}></img>
-              <span className="avatar-cover" onClick={_onUpload}>
-                <span className="icon iconfont pen">&#xe82c;</span>
-              </span>
               {cropperModalVisible && (
                 <CropperModal
                   imgUrl={imgUrl}
@@ -162,9 +152,13 @@ console.log('User.getStoreType()',User.getStoreType());
                 }}
               />
             </div>
+            <div className="phone-item">
+                <span className="label">企业微信姓名：</span>
+                <span><WWOpenDataCom type="userName" openid={weChatAccount}/></span>
+            </div>
             {isWorkWechat ? (
               <div className="phone-item">
-                <span className="label">企业微信号：</span>
+                <span className="label">企业微信帐号：</span>
                 <span>{weChatAccount}</span>
               </div>
             ) : (
@@ -181,6 +175,12 @@ console.log('User.getStoreType()',User.getStoreType());
                 </Button>
               </div>
             )}
+            <div>
+                <span className="label">所在部门：</span>
+                {departmentList.map((item,index)=>{
+                  return  <span><WWOpenDataCom type="departmentName" openid={item}/>{index<departmentList.length-1?'、':''}</span>
+                })}
+            </div>
             <div className="save-btn">
               <Button
                 type="primary"

src/modules/plan-manage/components/PlanList.jsx

 /*
  * @Author: zhangleyuan
  * @Date: 2021-02-20 16:46:46
- * @LastEditors: wufan
- * @LastEditTime: 2021-07-16 11:29:13
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-21 16:03:02
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */

src/modules/root/App.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2019-07-10 10:30:49
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-22 17:47:02
+ * @LastEditTime: 2021-07-19 16:21:07
  * @Description:
  */
 import React, { useContext, useEffect, useState } from 'react';
@@ -16,9 +16,10 @@ import User from '@/common/js/user';
 import BaseService from "@/domains/basic-domain/baseService";
 import moment from 'moment';
 import { VersionContext, VersionInfo, XMContext } from '@/store/context';
-import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList } from '@/store/actions/index';
+import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
 import Service from "@/common/js/service";
 import Bus from '@/core/tbus';
+import WechatApi from '@/common/js/wechatApi';
 import { func } from 'prop-types';
 
 const { Footer, Sider, Content } = Layout;
@@ -28,14 +29,16 @@ declare var window: any;
 const App: React.FC = (props: any) => {
   const [storeUserId, setStoreUserId] = useState('')
   const ctx: any = useContext(XMContext);
-  const [versionInfo, setVersionInfo] = useState<VersionInfo|null>(null)
+  const [versionInfo, setVersionInfo] = useState<VersionInfo | null>(null)
   const userId = User.getUserId();
   const [menuType, setMenuType] = useState(true);
+  const [initWechat, setInitWechat] = useState(false);
   const enterpriseId = User.getEnterpriseId();
   window.ctx = ctx;
 
 
   useEffect(() => {
+    initWechatConfig();
     getStoreAndUserInfo();
     getVersion();
     if (window.location.hash === "#/") {
@@ -44,7 +47,13 @@ const App: React.FC = (props: any) => {
       })
     }
   }, [])
+  async function initWechatConfig() {
+    WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] }).then(() => {
+      ctx.dispatch(setWechatLogin(true))
 
+    })
+
+  }
   useEffect(() => {
     getStorePermission();
   }, [window.location.hash])
@@ -66,7 +75,7 @@ const App: React.FC = (props: any) => {
       let version = res.result;
       User.setVersion(version);
       User.setExpirationTime(res.result.validEndTime)
-      let versioninfo:VersionInfo = {
+      let versioninfo: VersionInfo = {
         dayTime: version.dayTime,
         stateEnum: version.stateEnum,
         userNum: version.userNum === -1 ? '不限人数' : version.userNum,
@@ -87,28 +96,28 @@ const App: React.FC = (props: any) => {
   }
 
   function getStoreInfo() {
-    console.log("currentStoreUserInfo",window.currentStoreUserInfo);
+    console.log("currentStoreUserInfo", window.currentStoreUserInfo);
     const params = {
       storeId: User.getStoreId(),
       userId: User.getUserId(),
     };
     Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
-      if(res.success){
+      if (res.success) {
         const { id, storeUserId, storeName, userRole, storeType } = res.result;
         User.setStoreId(id);
         User.setStoreUserId(storeUserId);
         User.setStoreName(storeName);
-        Bus.trigger('storeNameChange',storeName);
+        Bus.trigger('storeNameChange', storeName);
         User.setUserRole(userRole);
         User.setStoreType(storeType);
-        setCurrentStoreUserInfo(id,storeUserId)
+        setCurrentStoreUserInfo(id, storeUserId)
         setStoreUserId(storeUserId);
         getUserPermission();
       }
     })
   }
 
-  function setCurrentStoreUserInfo(storeId:any,storeUserId:any){
+  function setCurrentStoreUserInfo(storeId: any, storeUserId: any) {
     window.currentStoreUserInfo.storeId = storeId;
     window.currentStoreUserInfo.storeUserId = storeUserId;
     window.currentStoreUserInfo.userId = User.getUserId();
@@ -134,7 +143,7 @@ const App: React.FC = (props: any) => {
       Bus.trigger('storeNameChange', storeName);
       User.setUserRole(userRole);
       User.setStoreType(storeType);
-      setCurrentStoreUserInfo(id,storeUserId);
+      setCurrentStoreUserInfo(id, storeUserId);
       ctx.dispatch(setStoreGroupList(storeGroupVOS))
       ctx.dispatch(setStoreList(storeVOS));
       setStoreUserId(storeUserId)

src/modules/root/ErrorCollege.jsx

@@ -71,9 +71,10 @@ export default class ErrorCollege extends React.Component {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      User.clearUserInfo();
-      const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
-      window.location.href = url;
+      window.RCHistory.replace('/login');
+      // User.clearUserInfo();
+      // const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId()||User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      // window.location.href = url;
 
     });
   }

src/modules/root/Header.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-20 17:39:52
+ * @LastEditors: yuananting
+ * @LastEditTime: 2021-08-05 19:50:53
  * @Description:
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';
@@ -19,6 +19,7 @@ import CourseService from '@/domains/course-domain/CourseService';
 import qrcode from '@/libs/qrcode/qrcode.js';
 import Bus from '@/core/tbus';
 import ClickOutside from '../../components/ClickOutside';
+import WWOpenDataCom from '@/components/WWOpenDataCom';
 import _ from 'underscore';
 
 const baseImg = 'https://image.xiaomaiketang.com/xm/rJeQaZxtc7.png';
@@ -134,7 +135,10 @@ function Header(props) {
         <div className='user-detail'>
           <div className='box'>
             <Tooltip title={nickName}>
-              <div className='name'>{nickName}</div>
+              <div className='name'>
+                {/* <span>{nickName}</span> */}
+                <WWOpenDataCom type='userName' openid={nickName} />
+              </div>
             </Tooltip>
             <span className='phone'>{phone}</span>
           </div>
@@ -201,9 +205,10 @@ function Header(props) {
       User.removeUserId();
       User.removeToken();
       User.removeEnterpriseId();
-      User.clearUserInfo();
-      const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId() || User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
-      window.location.href = url;
+      window.RCHistory.replace('/login');
+      // User.clearUserInfo();
+      // const url = `${LIVE_SHARE}store/index?id=${User.getCustomerStoreId() || User.getStoreId()}&userId=${User.getUserId()}&from=work_weixin`;
+      // window.location.href = url;
     });
   }
 
@@ -337,7 +342,11 @@ function Header(props) {
                     <div
                       className='url-link'
                       onClick={() => {
-                        window.open(`${LIVE_SHARE}store/index?id=${window.currentStoreUserInfo.storeId||User.getStoreId()}&userId=${window.currentStoreUserInfo.userId||User.getUserId()}&enterpriseId=${window.currentStoreUserInfo.enterpriseId||User.getEnterpriseId()}&from=admin&avatar=${avatar}`);
+                        window.open(
+                          `${LIVE_SHARE}store/index?id=${window.currentStoreUserInfo.storeId || User.getStoreId()}&userId=${
+                            window.currentStoreUserInfo.userId || User.getUserId()
+                          }&enterpriseId=${window.currentStoreUserInfo.enterpriseId || User.getEnterpriseId()}&from=admin&avatar=${avatar}`
+                        );
                       }}>
                       {'立即前往 >'}
                     </div>
@@ -374,7 +383,10 @@ function Header(props) {
                   }}
                   src={avatar || baseImg}
                 />
-                <span className='name'>{nickName}</span>
+                <span className='name'>
+                  {/* {nickName} */}
+                  <WWOpenDataCom type='userName' openid={nickName} />
+                </span>
               </div>
             </Dropdown>
           </div>

src/routes/config/mainRoutes.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-04-29 10:26:32
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-30 10:08:19
+ * @LastEditTime: 2021-08-05 19:51:01
  * @Description: 内容线路由配置
  */
 import Home from '@/modules/home/Home';
@@ -10,7 +10,7 @@ import EmployeesManagePage from '@/modules/store-manage/EmployeesManagePage';
 import EmployeeManage from '@/modules/college-manage/EmployeeManage';
 import personalInfoPage from '@/modules/personalInfo';
 import UserManagePage from '@/modules/store-manage/UserManagePage';
-import UserManage from '@/modules/college-manage/UserManagePage';
+import UserManage from '@/modules/college-manage/NewUsersManagePage';
 import StoreDecorationPage from '@/modules/store-manage/StoreDecorationPage';
 import CourseCatalogPage from '@/modules/store-manage/CourseCatalogPage';
 import LiveCoursePage from '@/modules/course-manage/LiveCoursePage';

src/store/actions/basicAction.ts

@@ -10,7 +10,8 @@ import {
     STORE_GROUP_PERMISSION,
     STORE_PERMISSION,
     STORE_GROUP_LIST,
-    STORE_LIST
+    STORE_LIST,
+    WECHAT_LOGIN
 } from './constants'
 
 
@@ -34,12 +35,18 @@ const setStoreList = (payload: any) => ({
     payload
 })
 
+const setWechatLogin = (payload: any) => ({
+    type: WECHAT_LOGIN,
+    payload
+})
+
 
 
 export {
     setStoreGroupPermission,
     setStorePermission,
     setStoreGroupList,
-    setStoreList
+    setStoreList,
+    setWechatLogin
 }
 

src/store/actions/constants.ts

@@ -10,11 +10,13 @@ const STORE_GROUP_PERMISSION = 'STORE_GROUP_PERMISSION';
 const STORE_PERMISSION = 'STORE_PERMISSION';
 const STORE_GROUP_LIST = 'STORE_GROUP_LIST';
 const STORE_LIST = 'STORE_LIST';
+const WECHAT_LOGIN = 'WECHAT_LOGIN';
 
 export {
     STORE_GROUP_PERMISSION,
     STORE_PERMISSION,
     STORE_GROUP_LIST,
     STORE_LIST,
+    WECHAT_LOGIN,
     
 }
\ No newline at end of file

src/store/actions/index.ts

@@ -4,12 +4,14 @@ import {
     setStoreGroupPermission,
     setStorePermission,
     setStoreGroupList,
-    setStoreList
+    setStoreList,
+    setWechatLogin
 } from './basicAction';
 
 export  {
     setStoreGroupPermission,
     setStorePermission,
     setStoreGroupList,
-    setStoreList
+    setStoreList,
+    setWechatLogin
 }
\ No newline at end of file

src/store/reducers/basicReducer.ts

@@ -10,7 +10,8 @@ import {
     STORE_GROUP_PERMISSION,
     STORE_PERMISSION,
     STORE_GROUP_LIST,
-    STORE_LIST
+    STORE_LIST,
+    WECHAT_LOGIN,
 } from '@/store/actions/constants';
 import _ from 'underscore';
 import Permission from '@/common/js/permission';
@@ -45,6 +46,11 @@ const basicReducer = (state: any, action: any) => {
             return Object.assign({}, state, {
                 storeList,
             });
+            case WECHAT_LOGIN:
+            const wechatLogin: any = action.payload;
+            return Object.assign({}, state, {
+                wechatLogin,
+            });
         default:
             return state;
     }