diff --git a/src/api/system/user.js b/src/api/system/user.js index b2e9173c..2262956b 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -8,8 +8,8 @@ import ajax from '@/utils/xajax.js' * name 姓名 * userNo 工号 * departId 部门ID - * } query - * @returns + * } query + * @returns */ const list=function(query) { return ajax.get('/xboe/sys/user/page',{params:query}); @@ -19,8 +19,8 @@ const list=function(query) { * 通过用户名查询用户信息(该接口限定使用场景为先查本地库后查旧系统) * @param { * 用户名 - * } name - * @returns + * } name + * @returns */ const searchLoginName = function(name) { return ajax.get('/xboe/sys/user/search-loginname?loginName='+name); @@ -28,8 +28,8 @@ const searchLoginName = function(name) { /** * 根据多个人员的id,得到用户的信息(简要信息) - * @param {账号ID数组} ids - * @returns + * @param {账号ID数组} ids + * @returns */ const getByIds = function(ids) { return ajax.postJson('/xboe/sys/user/ids',ids); @@ -37,8 +37,8 @@ const getByIds = function(ids) { /** * 根据loginName,得到用户的信息(简要信息) - * @param {用户名} loginName - * @returns + * @param {用户名} loginName + * @returns */ const getByLoginName = function(loginName) { return ajax.get('/xboe/sys/user/loginname?loginName='+loginName); @@ -46,7 +46,7 @@ const getByLoginName = function(loginName) { /** * 根据name,得到用户的信息(简要信息) - * @param {用户姓名} name + * @param {用户姓名} name * @returns 返回列表 */ const findByName = function(name) { @@ -55,18 +55,23 @@ const getByLoginName = function(loginName) { /** * 得到用户详情(详细信息) - * @param {*} id - * @returns + * @param {*} id + * @returns */ const detail = function(id) { return ajax.get('/xboe/sys/user/detail?id='+id); } +const getOrgSimpleByUserId = function(id) { + return ajax.get('/xboe/sys/user/org/org-byuserid?userId='+id); +} + export default{ list, searchLoginName, getByIds, getByLoginName, findByName, - detail + detail, + getOrgSimpleByUserId } diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 05105de1..e4630c8a 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -387,6 +387,7 @@ import apiTag from '../../api/modules/tag.js'; import apiHRBP from '../../api/boe/HRBP.js'; import apiCourse from '../../api/modules/course.js'; import apiOrg from '../../api/system/organiza.js'; +import apiUser from '../../api/system/user.js'; import WxEditor from '@/components/Editor/index.vue'; import catalogSort from '@/components/Course/catalogSort.vue'; import { courseType, getType } from '../../utils/tools.js'; @@ -777,20 +778,32 @@ export default { this.contentInfo.list = result.contents; this.sectionInfo.list = result.sections; this.courseTeachers = result.teachers; //课程的老师信息 - + if(!this.courseInfo.orgId){ - this.courseInfo.orgId=this.userInfo.departId; - } - //$this.orgKid=''; - if($this.courseInfo.orgId){ - apiOrg.getSimple($this.courseInfo.orgId).then(rrs=>{ + //根据课程创建者获取机构id + apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{ + if(ors.status==200){ + $this.courseInfo.orgId=ors.result.id; + apiOrg.getSimple(ors.result.id).then(rrs=>{ + if(rrs.status==200){ + $this.orgName=rrs.result.name; + $this.orgKid=rrs.result.kid; + } + }) + }else{ + // + } + }) + + }else{ + apiOrg.getSimple(this.courseInfo.orgId).then(rrs=>{ if(rrs.status==200){ $this.orgName=rrs.result.name; $this.orgKid=rrs.result.kid; } }) } - + this.resOwnerArray=[]; if (result.course.resOwner1 == '') { this.resOwnerArray.push(result.course.resOwner1);