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

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

@@ -17,7 +17,7 @@ const { Search } = Input;
 const { confirm } = Modal;
 const { confirm } = Modal;
 const DefaultQuery = {
 const DefaultQuery = {
   size: 10,
   size: 10,
-  current: 1,
+  current:1,
 };
 };
 function DepartMentTabCon(props) {
 function DepartMentTabCon(props) {
   const [chooseMembersModalVisible, setChooseMembersModalVisible] = useState(
   const [chooseMembersModalVisible, setChooseMembersModalVisible] = useState(
@@ -360,12 +360,12 @@ function DepartMentTabCon(props) {
           />
           />
           <div className="box-footer">
           <div className="box-footer">
             <PageControl
             <PageControl
-              current={query.current}
+              current={query.current - 1}
               pageSize={query.size}
               pageSize={query.size}
               total={total}
               total={total}
               toPage={(page) => {
               toPage={(page) => {
                 const queryStates = _.clone(query);
                 const queryStates = _.clone(query);
-                queryStates.current = page;
+                queryStates.current = page + 1;
                 setQuery(queryStates);
                 setQuery(queryStates);
                 getUserList(null,null,queryStates.current);
                 getUserList(null,null,queryStates.current);
               }}
               }}

src/modules/personalInfo/index.tsx

@@ -2,7 +2,7 @@
  * @Author: zhangleyuan
  * @Author: zhangleyuan
  * @Date: 2020-11-27 15:06:31
  * @Date: 2020-11-27 15:06:31
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-02 16:35:20
+ * @LastEditTime: 2021-08-05 10:26:25
  * @Description: 描述一下
  * @Description: 描述一下
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
@@ -178,7 +178,7 @@ function PersonalInfoPage() {
             <div>
             <div>
                 <span className="label">所在部门：</span>
                 <span className="label">所在部门：</span>
                 {departmentList.map((item,index)=>{
                 {departmentList.map((item,index)=>{
-                  return  <span>{item}{index<departmentList.length-1?'、':''}</span>
+                  return  <span><WWOpenDataCom type="departmentName" openid={item}/>{index<departmentList.length-1?'、':''}</span>
                 })}
                 })}
             </div>
             </div>
             <div className="save-btn">
             <div className="save-btn">