Skip to content

X
xiaomai-cloud-class-web
Commit e168839f by zhangleyuan
Options

Merge branch 'master' into feature/zhangleyuan/20210812/opzi-organize

parents 816c728b 45a7f18a
Showing with 10 additions and 8 deletions
src/modules/college-manage/modal/ChooseMembersModal.jsx
...@@ -285,10 +285,11 @@ class ChooseMembersModal extends React.Component { ...@@ -285,10 +285,11 @@ class ChooseMembersModal extends React.Component {
visible={isOpen} visible={isOpen}
onCancel={() => this.handleClose()} onCancel={() => this.handleClose()}
onOk={() => { onOk={() => {
if (User.getVersion() && User.getVersion().whetherReachUserNum) { //xmqxy446去除此优化
message.error("添加失败，企业使用人数超出限制") // if (User.getVersion() && User.getVersion().whetherReachUserNum) {
return // message.error("添加失败，企业使用人数超出限制")
} // return
// }
if (_.isEmpty(selectUserList)) { if (_.isEmpty(selectUserList)) {
message.warning(type === 'USER' ? '请选择员工' : '请选择学员') message.warning(type === 'USER' ? '请选择员工' : '请选择学员')
return null; return null;
......
src/modules/college-manage/modal/NewChooseMembersModal.jsx
...@@ -296,10 +296,11 @@ class NewChooseMembersModal extends React.Component { ...@@ -296,10 +296,11 @@ class NewChooseMembersModal extends React.Component {
visible={visible} visible={visible}
onCancel={() => this.handleClose()} onCancel={() => this.handleClose()}
onOk={() => { onOk={() => {
if (User.getVersion() && User.getVersion().whetherReachUserNum) { //xmqxy446去除此优化
message.error("添加失败，企业使用人数超出限制") // if (User.getVersion() && User.getVersion().whetherReachUserNum) {
return // message.error("添加失败，企业使用人数超出限制")
} // return
// }
if (_.isEmpty(selectUserList)) { if (_.isEmpty(selectUserList)) {
message.warning(type === 'USER' ? '请选择员工' : '请选择学员') message.warning(type === 'USER' ? '请选择员工' : '请选择学员')
return null; return null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment