diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 024d82da..40ffdfb9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -444,16 +444,21 @@ public class CourseManageApi extends ApiBaseController{ return badRequest("此课程中已有审核,不能再提交审核,如修改请先撤回"); } if(!isLocalDevelopment()) { - //转化用户id - User u = userService.getByUserNo(dto.getAuditUser().getCode()); - if(u==null) { //本地没有,需要同步 - //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); - UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid()); - Account a =userService.syncAccountUser(fwUser); - dto.getAuditUser().setAid(a.getId()); + if(StringUtils.isBlank(dto.getAuditUser().getAid())) { + //转化用户id + User u = userService.getByUserNo(dto.getAuditUser().getCode()); + if(u==null) { //本地没有,需要同步 + //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); + UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid()); + Account a =userService.syncAccountUser(fwUser); + dto.getAuditUser().setAid(a.getId()); + }else { + dto.getAuditUser().setAid(u.getId()); + } }else { - dto.getAuditUser().setAid(u.getId()); + log.info("已获取过hrbp审核人id【"+dto.getAuditUser().getAid()+"】,不需要再转化"); } + }else { //弄成固定值,用于测试 dto.getAuditUser().setAid(getCurrent().getAccountId()); @@ -551,19 +556,21 @@ public class CourseManageApi extends ApiBaseController{ } if(!isLocalDevelopment()) { - //转化用户id - User u = userService.getByUserNo(ucode); - if(u==null) { //本地没有,需要同步 - //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); - UserVo fwUser = fwUserService.getById(ukid); - Account a =userService.syncAccountUser(fwUser); - audit.setAid(a.getId()); - }else { - audit.setAid(u.getId()); - } if(StringUtils.isBlank(audit.getAid())) { - return badRequest("查询组织HRBP审核人员失败"); + //转化用户id + User u = userService.getByUserNo(ucode); + if(u==null) { //本地没有,需要同步 + //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); + UserVo fwUser = fwUserService.getById(ukid); + Account a =userService.syncAccountUser(fwUser); + audit.setAid(a.getId()); + }else { + audit.setAid(u.getId()); + } + }else { + log.info("已获取过hrbp审核人id【"+audit.getAid()+"】,不需要再转化"); } + }else { //弄成固定值,用于测试 audit.setAid(getCurrent().getAccountId()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseCrowd.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseCrowd.java index 2222941c..abef4413 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseCrowd.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseCrowd.java @@ -32,7 +32,7 @@ public class CourseCrowd extends IdBaseEntity{ /** * 群组,受众id */ - @Column(name = "group_id",nullable=false,length=20) + @Column(name = "group_id",nullable=false,length=36) private String groupId; /**