|
@@ -9,11 +9,13 @@ import com.ym.mec.auth.api.enums.YesOrNoEnum;
|
|
|
import com.ym.mec.biz.dal.dao.TeacherDao;
|
|
|
import com.ym.mec.biz.dal.entity.CooperationOrgan;
|
|
|
import com.ym.mec.biz.dal.entity.SchoolStaff;
|
|
|
+import com.ym.mec.biz.dal.entity.SysConfig;
|
|
|
import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
|
|
|
import com.ym.mec.biz.dal.mapper.SchoolStaffMapper;
|
|
|
import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
|
|
|
import com.ym.mec.biz.service.CooperationOrganService;
|
|
|
import com.ym.mec.biz.service.SchoolStaffService;
|
|
|
+import com.ym.mec.biz.service.SysConfigService;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
@@ -30,6 +32,7 @@ import java.text.MessageFormat;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
+import java.util.Optional;
|
|
|
import java.util.Set;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -48,6 +51,8 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
|
|
|
private RedissonClient redissonClient;
|
|
|
@Autowired
|
|
|
private TeacherDao teacherDao;
|
|
|
+ @Autowired
|
|
|
+ private SysConfigService sysConfigService;
|
|
|
|
|
|
/**
|
|
|
* 查询详情
|
|
@@ -179,13 +184,15 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
|
|
|
|
|
|
} else {
|
|
|
|
|
|
- // TODO:查询用户默认头象
|
|
|
+ // 查询用户默认头象
|
|
|
+ String defaultAvatar = Optional.ofNullable(sysConfigService.findByParamName(SysConfigService.USER_DEFAULT_AVATAR))
|
|
|
+ .map(SysConfig::getParanValue).orElse("");
|
|
|
|
|
|
// 创建默认用户信息
|
|
|
user = new SysUser();
|
|
|
user.setUsername(schoolStaff.getUsername());
|
|
|
user.setPassword(defaultPassword);
|
|
|
- user.setAvatar("");
|
|
|
+ user.setAvatar(defaultAvatar);
|
|
|
user.setPhone(schoolStaff.getMobile());
|
|
|
user.setTenantId(cooperation.getTenantId());
|
|
|
user.setOrganId(cooperation.getOrganId());
|