课程的修改

This commit is contained in:
daihh
2022-11-22 19:45:14 +08:00
parent 292e1cb650
commit 8ea416ed71
2 changed files with 27 additions and 20 deletions

View File

@@ -444,16 +444,21 @@ public class CourseManageApi extends ApiBaseController{
return badRequest("此课程中已有审核,不能再提交审核,如修改请先撤回"); return badRequest("此课程中已有审核,不能再提交审核,如修改请先撤回");
} }
if(!isLocalDevelopment()) { if(!isLocalDevelopment()) {
//转化用户id if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
User u = userService.getByUserNo(dto.getAuditUser().getCode()); //转化用户id
if(u==null) { //本地没有,需要同步 User u = userService.getByUserNo(dto.getAuditUser().getCode());
//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid()); if(u==null) { //本地没有,需要同步
UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid()); //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
Account a =userService.syncAccountUser(fwUser); UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid());
dto.getAuditUser().setAid(a.getId()); Account a =userService.syncAccountUser(fwUser);
dto.getAuditUser().setAid(a.getId());
}else {
dto.getAuditUser().setAid(u.getId());
}
}else { }else {
dto.getAuditUser().setAid(u.getId()); log.info("已获取过hrbp审核人id【"+dto.getAuditUser().getAid()+"】,不需要再转化");
} }
}else { }else {
//弄成固定值,用于测试 //弄成固定值,用于测试
dto.getAuditUser().setAid(getCurrent().getAccountId()); dto.getAuditUser().setAid(getCurrent().getAccountId());
@@ -551,19 +556,21 @@ public class CourseManageApi extends ApiBaseController{
} }
if(!isLocalDevelopment()) { 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())) { 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 { }else {
//弄成固定值,用于测试 //弄成固定值,用于测试
audit.setAid(getCurrent().getAccountId()); audit.setAid(getCurrent().getAccountId());

View File

@@ -32,7 +32,7 @@ public class CourseCrowd extends IdBaseEntity{
/** /**
* 群组受众id * 群组受众id
*/ */
@Column(name = "group_id",nullable=false,length=20) @Column(name = "group_id",nullable=false,length=36)
private String groupId; private String groupId;
/** /**