feat:更改获取讲师的接口

cbfb51a6 · zhangleyuan · 410a0f44 · cbfb51a6 · cbfb51a6 · cbfb51a6
Commit cbfb51a6 authored Dec 23, 2020 by zhangleyuan
8 changed files
--- a/src/data-source/store/request-apis.ts
+++ b/src/data-source/store/request-apis.ts
 /*
 * @Author: wufan
 * @Date: 2020-11-25 18:25:02
- * @LastEditors: wufan
+ * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-22 10:12:13
+ * @LastEditTime: 2020-12-23 16:52:56
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -65,3 +65,6 @@ export function editCourseCategory(params: object) {
 export function delCourseCategory(params: object) {
  return Service.Hades("public/hades/delCourseCategory", params);
 }
+export function getStoreUserBasicPage(params: object) {
+  return Service.Hades("public/hades/getStoreUserBasicPage", params);
+}
--- a/src/domains/store-domain/storeService.ts
+++ b/src/domains/store-domain/storeService.ts
 /*
 * @Author: wufan
 * @Date: 2020-11-25 18:25:02
- * @LastEditors: wufan
+ * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-22 10:11:57
+ * @LastEditTime: 2020-12-23 16:54:10
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
-import { getEmployeeList, getUserList, getStoreDecorationList, getStoreRole, addEmployee, editEmployee, deleteEmployee, getCourseCatalogList, getAllSonCategory, addCourseCategory, delCourseCategory, editCourseCategory, deleteStoreDecorationList, addStoreBanner, editStoreBanner, moveBannerSequence } from '@/data-source/store/request-apis';
+import { getEmployeeList, getUserList, getStoreDecorationList, getStoreRole, addEmployee, editEmployee, deleteEmployee, getCourseCatalogList, getAllSonCategory, addCourseCategory, delCourseCategory, editCourseCategory, deleteStoreDecorationList, addStoreBanner, editStoreBanner, moveBannerSequence,getStoreUserBasicPage} from '@/data-source/store/request-apis';
 export default class StoreService {
  // 获取员工列表 
  static getEmployeeList(params: any) {
    return getEmployeeList(params);
  }
+  // 获取不受权限控制的员工列表 
+  static getStoreUserBasicPage(params: any) {
+    return getStoreUserBasicPage(params);
+  }
  // 获取店铺角色
  static getStoreRole(params: any) {
    return getStoreRole(params);
@@ -78,5 +81,5 @@ export default class StoreService {
  static delCourseCategory(params: any) {
    return delCourseCategory(params);
  }
 }
\ No newline at end of file
--- a/src/modules/course-manage/components/AddLiveClass.jsx
+++ b/src/modules/course-manage/components/AddLiveClass.jsx
@@ -55,7 +55,7 @@ class AddLiveClass extends React.Component {
      current,
      size:10
    };
-    StoreService.getEmployeeList( _query).then((res) => {
+    StoreService.getStoreUserBasicPage( _query).then((res) => {
        const { result = {} } = res;
        const { records = [], total = 0, hasNext } = result;
        const list = current > 1 ? teacherList.concat(records) : records;
@@ -73,7 +73,7 @@ class AddLiveClass extends React.Component {
      current,
      size:10
    };
-    StoreService.getEmployeeList( _query).then((res) => {
+    StoreService.getStoreUserBasicPage( _query).then((res) => {
        const { result = {} } = res;
        const { records = [], total = 0, hasNext} = result;
        const { teacherId } = this.props.data

--- a/src/modules/course-manage/components/LiveCourseFilter.jsx
+++ b/src/modules/course-manage/components/LiveCourseFilter.jsx
@@ -53,7 +53,7 @@ class LiveCourseFilter extends React.Component {
      current,
      size:10
    };
-    StoreService.getEmployeeList( _query).then((res) => {
+    StoreService.getStoreUserBasicPage( _query).then((res) => {
        const { result = {} } = res;
        const { records = [], total = 0, hasNext } = result;
        const list = current > 1 ? teacherList.concat(records) : records;

--- a/src/modules/prepare-lesson/components/OperateArea.jsx
+++ b/src/modules/prepare-lesson/components/OperateArea.jsx
@@ -22,8 +22,8 @@ import NonCompliantFileModal from '../modal/NonCompliantFileModal';
 import { getFileTypeByName } from './FolderManage';
 const DEL_FOLDER_URL_MAP = {
-  'MYSELF': 'public/apollo/delFolder',
+  'MYSELF': 'public/hadesStore/delFolder',
-  'COMMON': 'public/apollo/delCommonFolder'
+  'COMMON': 'public/hadesStore/delFolder'
 }
 // 支持本地上传的文件类型
@@ -208,33 +208,23 @@ class OperateArea extends React.Component {
  // 批量删除文件
  handleDeleteFile = () => {
-    const { instId } = window.currentUserInstInfo;
-    // 判断此文件是否有关联的课次
    const { selectedFileIds, currentRootDisk: { disk }, folderPathList } = this.props;
-    axios.Apollo('public/apollo/judgeRelation', {
+    Modal.confirm({
-      folderIds: selectedFileIds,
-      instId: instId || LS.get('instId')
-    }).then((res) => {
-      // 如果有关联的文件，二次弹窗确认
-      const hasRelative = !!res.result;
-      Modal.confirm({
      title: '确认删除所选的文件吗？',
-      content: hasRelative ? '此文件已关联了课次，删除后，学员将不能查看到此文件。' : '删除后，数据将无法恢复。',
+      content: '删除后，数据将无法恢复。',
-        icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
+      onOk: () => {
-        onOk: () => {
+        const currentFolder  = folderPathList[folderPathList.length - 1];
-          const currentFolder = folderPathList[folderPathList.length - 1];
+        Service.Hades(DEL_FOLDER_URL_MAP[disk], {
-          axios.Apollo(DEL_FOLDER_URL_MAP[disk], {
+          operatorId: User.getUserId(),
-            ids: selectedFileIds,
+          storeId: User.getStoreId(),
-            instId: instId || LS.get('instId')
+          ids: selectedFileIds,
-          }).then(() => {
+        }).then(() => {
-            message.success('删除成功');
+          message.success('删除成功');
-            this.props.onRefresh({  parentId: currentFolder.id || null });
+          this.props.onRefresh({  parentId: currentFolder.id || null });
-          })
+        })
-        }
+      }
-      })
+    });
-    })
  }
  // 显示移动文件弹窗
  handleShowSelectFileModal = () => {
    this.setState({

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
@@ -201,7 +201,6 @@ class SelectPrepareFileModal extends React.Component {
      }
      this.setState({ selectedFileList });
    } else {
      this.setState({
        currentFile: file,
        currentFileIndex: index
@@ -310,21 +309,6 @@ class SelectPrepareFileModal extends React.Component {
  }
  handleChooseFile = async () => {
-    // // 校验是否已经欠费
-    // const { instId } = window.currentUserInstInfo;
-    // const balanceRes = await axios.Business("public/liveAssets/query", { instId });
-    // // balance小于等于0表示已经欠费，旗舰版用户不需要校验余额
-    // const ultimateRes = await axios.Business('public/inst/checkInstProduct', {
-    //   instId,
-    //   productCodeList: ['ULTIMATESELL', 'PIP_TO_ULTIMATE', 'HIGH_TO_ULTIMATE']
-    // });
-    // const { result } = balanceRes;
-    // if ((!result || result.balance <= 0) && !ultimateRes.result) {
-    //   this.handleShowNoticeModal(balance);
-    //   return;
-    // }
    const dom = document.querySelector('#detailFileInput');
    dom.click();
  }
@@ -399,11 +383,8 @@ class SelectPrepareFileModal extends React.Component {
  }
  handleUploadDone = (file, resourceId) => {
-    console.log('9999');
    const { folderList, folderPathList, currentRootDisk, uploadFolderPath } = this.state;
    const { scene } = this.props;
-    // const { teacherId, instId } = window.currentUserInstInfo;
    const currentFolder = folderPathList[folderPathList.length - 1];
    const { id = null } = uploadFolderPath || currentFolder;
    let { size, type, name } = file;
@@ -411,18 +392,6 @@ class SelectPrepareFileModal extends React.Component {
    if (!type) {
      type = getFileTypeByName(name)
    }
-    // const params = {
-    //   name,
-    //   resourceId,
-    //   folderSize: size,
-    //   folderFormat: type,
-    //   folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
-    //   disk: currentRootDisk.disk,
-    //   instId: instId || LS.get('instId'),
-    //   createUser: teacherId ? "TEACHER" : "ADMIN",
-    //   parentId: id
-    // }
    const params = {
      name,
      resourceId,
@@ -464,16 +433,6 @@ class SelectPrepareFileModal extends React.Component {
      localFileList: []
    });
  }
-  // 余额欠费提示弹窗
-  // handleShowNoticeModal = (balance) => {
-  //   Modal.info({
-  //     title: '无法继续操作',
-  //     content: '直播服务已升级，请联系运营老师。',
-  //     icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>
-  //   })
-  // }
  renderFooter = () => {
    const { selectedFileList, currentRootDisk } = this.state;
    const {
@@ -527,7 +486,7 @@ class SelectPrepareFileModal extends React.Component {
            type="primary"
            disabled={!hasSelect && multiple}
            onClick={this.handleSelectFileDone}
-          >{`确定${hasSelect ? `(${selectedFileLength})` : ''}`}</Button> :
+          >{`确定${hasSelect && multiple ? `(${selectedFileLength})` : ''}`}</Button> :
          <Button
            type="primary"
            onClick={this.handleMoveToTargetFolder}

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -295,7 +295,6 @@ class FolderList extends React.Component {
  // 删除文件
  handleDeleteFolder = (folder) => {
    const { currentRootDisk: { disk } } = this.props;
-    const { instId } = window.currentUserInstInfo;
    Modal.confirm({
      title: '确认删除所选的文件吗？',
      content: '删除后，数据将无法恢复。',

--- a/src/modules/resource-disk/components/OperateArea.jsx
+++ b/src/modules/resource-disk/components/OperateArea.jsx
@@ -25,8 +25,8 @@ import User from '@/common/js/user';
 const { Search } = Input;
 const DEL_FOLDER_URL_MAP = {
-  'MYSELF': 'public/apollo/delFolder',
+  'MYSELF': 'public/hadesStore/delFolder',
-  'COMMON': 'public/apollo/delCommonFolder'
+  'COMMON': 'public/hadesStore/delFolder'
 }
 // 支持本地上传的文件类型
 const localFileTypeMap = LOCAL_FILE_TYPE_MAP.join(',');
@@ -203,31 +203,23 @@ class OperateArea extends React.Component {
  // 批量删除文件
  handleDeleteFile = () => {
-    const { instId } = window.currentUserInstInfo;
-    // 判断此文件是否有关联的课次
    const { selectedFileIds, currentRootDisk: { disk }, folderPathList } = this.props;
-    Service.Hades('public/apollo/judgeRelation', {
+    Modal.confirm({
-      instId,
-      folderIds: selectedFileIds,
-    }).then((res) => {
-      // 如果有关联的文件，二次弹窗确认
-      const hasRelative = !!res.result;
-      Modal.confirm({
      title: '确认删除所选的文件吗？',
-      content: hasRelative ? '此文件已关联了课次，删除后，学员将不能查看到此文件。' : '删除后，数据将无法恢复。',
+      content: '删除后，数据将无法恢复。',
-        icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
+      onOk: () => {
-        onOk: () => {
+        const  currentFolder  = folderPathList[folderPathList.length - 1];
-          const currentFolder = folderPathList[folderPathList.length - 1];
+        Service.Hades(DEL_FOLDER_URL_MAP[disk], {
-          Service.Hades(DEL_FOLDER_URL_MAP[disk], {
+          operatorId: User.getUserId(),
-            instId,
+          storeId: User.getStoreId(),
-            ids: selectedFileIds,
+          ids: selectedFileIds,
-          }).then(() => {
+        }).then(() => {
-            message.success('删除成功');
+          message.success('删除成功');
-            this.props.onRefresh({  parentId: currentFolder.id || null });
+          console.log("currentFolder",currentFolder);
-          })
+          this.props.onRefresh({  parentId: currentFolder.id || null });
-        }
+        })
-      })
+      }
-    })
+    });
  }
  // 显示移动文件弹窗