|
@@ -1,6 +1,8 @@
|
|
|
package org.jeecg.modules.oa.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.apache.shiro.SecurityUtils;
|
|
|
+import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.modules.oa.entity.Enrollment;
|
|
|
import org.jeecg.modules.oa.entity.EnrollmentContact;
|
|
|
import org.jeecg.modules.oa.entity.EnrollmentEdu;
|
|
@@ -132,6 +134,13 @@ public class EnrollmentServiceImpl extends ServiceImpl<EnrollmentMapper, Enrollm
|
|
|
Enrollment enrollment = this.getById(id);
|
|
|
SysUser user = new SysUser();
|
|
|
BeanUtils.copyProperties(enrollment, user,"id");
|
|
|
+
|
|
|
+
|
|
|
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
|
+ user.setOrgCode(sysUser.getOrgCode());
|
|
|
+ user.setPkOrg(sysUser.getPkOrg());
|
|
|
+ user.setPkOrgName(sysUser.getPkOrgName());
|
|
|
+
|
|
|
user.setSex(enrollment.getGender());
|
|
|
List<EnrollmentJob> enrollmentJobList = enrollmentJobMapper.selectByMainId(id);
|
|
|
List<SysUserJob> jobs = new ArrayList<>();
|