yexuejc007/PlayEdu
1
0
Fork 0
mirror of https://github.com/PlayEdu/PlayEdu synced 2025-07-25 19:29:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

学员的默认头像

Browse Source
This commit is contained in:
none 2023-04-11 11:12:25 +08:00
parent 7251c68e83
commit 2f49a9bdaf
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/playedu/api/controller/backend/SystemController.java
View File

@ -70,7 +70,7 @@ public class SystemController {
defaultCourseThumbs.add(apiUrl + "/images/courses/thumb1.png");
defaultCourseThumbs.add(apiUrl + "/images/courses/thumb2.png");
defaultCourseThumbs.add(apiUrl + "/images/courses/thumb3.png");
data.put("default_course_thumbs", defaultCourseThumbs);
data.put("default.course_thumbs", defaultCourseThumbs);
return JsonResponse.data(data);
}

20
src/main/java/xyz/playedu/api/controller/backend/UserController.java
View File

@ -13,7 +13,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import xyz.playedu.api.BCtx;
import xyz.playedu.api.constant.BPermissionConstant;
import xyz.playedu.api.constant.CConfig;
import xyz.playedu.api.constant.SystemConstant;
import xyz.playedu.api.domain.Department;
import xyz.playedu.api.domain.User;
@ -36,7 +38,6 @@ import java.util.stream.Collectors;
/**
* @Author 杭州白书科技有限公司
*
* @create 2023/2/23 09:48
*/
@RestController
@ -44,13 +45,17 @@ import java.util.stream.Collectors;
@RequestMapping("/backend/v1/user")
public class UserController {
@Autowired private UserService userService;
@Autowired
private UserService userService;
@Autowired private UserDepartmentService userDepartmentService;
@Autowired
private UserDepartmentService userDepartmentService;
@Autowired private DepartmentService departmentService;
@Autowired
private DepartmentService departmentService;
@Autowired private ApplicationContext context;
@Autowired
private ApplicationContext context;
@BackendPermissionMiddleware(slug = BPermissionConstant.USER_INDEX)
@GetMapping("/index")
@ -188,8 +193,12 @@ public class UserController {
return JsonResponse.error("一次最多导入1000条数据");
}
// 导入表格的有效数据起始行-用于错误提醒
Integer startLine = req.getStartLine();
// 默认的学员头像
String defaultAvatar = BCtx.getConfig().get(CConfig.MEMBER_DEFAULT_AVATAR);
List<String[]> errorLines = new ArrayList<>();
errorLines.add(new String[]{"错误行", "错误信息"}); // 错误表-表头
@ -287,6 +296,7 @@ public class UserController {
tmpInsertUser.setPassword(HelperUtil.MD5(tmpPassword + tmpSalt));
tmpInsertUser.setSalt(tmpSalt);
tmpInsertUser.setName(tmpName);
tmpInsertUser.setAvatar(defaultAvatar);
tmpInsertUser.setIdCard(userItem.getIdCard());
tmpInsertUser.setCreateIp(SystemConstant.INTERNAL_IP);
tmpInsertUser.setCreateCity(SystemConstant.INTERNAL_IP_AREA);