11.27

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java

@@ -272,8 +272,10 @@ public class UserController {
         }
         if (user.getSupervisorId() != null && (Objects.equals(user.getUserType(), "1") || Objects.equals(user.getUserType(), "2"))) {
             AdminUserDO supervisorUser = userService.getUser(user.getSupervisorId());
-            String supervisor = supervisorUser.getNickname();
-            user.setSupervisor(supervisor);
+            if (supervisorUser!=null) {
+                String supervisor = supervisorUser.getNickname();
+                user.setSupervisor(supervisor);
+            }
         }
         // 拼接数据
         DeptDO dept = deptService.getDept(user.getDeptId());
@@ -417,7 +419,7 @@ public class UserController {
     })
     @PreAuthorize("@ss.hasPermission('system:user:importGraduateStudent')")
     public CommonResult<UserImportRespVO> importGraduateExcel(@RequestParam("file") MultipartFile file,
-                                                             @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+                                                              @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
         List<graduateStudentImportExcelVO> list = ExcelUtils.read(file, graduateStudentImportExcelVO.class);
 
         return success(userService.importGraduateList(list, updateSupport));

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileRespVO.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.user.vo.profile;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptSimpleRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.dept.vo.post.PostSimpleRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RoleSimpleRespVO;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -84,7 +85,7 @@ public class UserProfileRespVO {
     @Schema(description = "专业名称")
     private String major;
 
-    @Schema(description = "专硕(学硕)名称", example = "2")
+    @ExcelProperty("硕士类型")
     private String masterType;
 
     @Schema(description = "导师id", example = "21284")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/profile/UserProfileUpdateReqVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.user.vo.profile;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
@@ -39,7 +40,7 @@ public class UserProfileUpdateReqVO {
     @Schema(description = "专业名称")
     private String major;
 
-    @Schema(description = "专硕(学硕)名称", example = "2")
+    @ExcelProperty("硕士类型")
     private String masterType;
 
     @Schema(description = "导师id", example = "21284")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/StudentExportExcelVO.java

@@ -36,8 +36,8 @@ public class StudentExportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-//    @ExcelProperty("专硕名称")
-//    private String masterType;
+    @ExcelProperty("硕士类型")
+    private String masterType;
 
     @ExcelProperty(value = "用户性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/StudentImportExcelVO.java

@@ -39,8 +39,8 @@ public class StudentImportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-//    @ExcelProperty("专硕名称")
-//    private String masterType;
+    @ExcelProperty("硕士类型")
+    private String masterType;
 
     @ExcelProperty(value = "用户性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -113,7 +113,7 @@ public class UserRespVO{
     @Schema(description = "专业名称")
     private String major;
 
-    @Schema(description = "专硕名称")
+    @Schema(description = "硕士类型")
     private String masterType;
     //
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/graduateStudentExportExcelVO.java

@@ -34,7 +34,7 @@ public class graduateStudentExportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-    @ExcelProperty("专硕类型")
+    @ExcelProperty("硕士类型")
     private String masterType;
 
     @ExcelProperty("学号")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/graduateStudentImportExcelVO.java

@@ -42,7 +42,7 @@ public class graduateStudentImportExcelVO {
     @ExcelProperty("专业名称")
     private String major;
 
-    @ExcelProperty("专硕类型")
+    @ExcelProperty("硕士类型")
     private String masterType;
 
     @ExcelProperty("学号")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -955,10 +955,10 @@ public class AdminUserServiceImpl implements AdminUserService {
 
             // 2.2.2 如果存在，判断是否允许更新
             if (!isUpdateSupport) {
-                if (importUser.getUsername() != null) {
+                if (importUser.getNickname() != null) {
                     respVO.getFailureUsernames().put(importUser.getNickname(), USER_USERNUMBER_EXISTS.getMsg());
-                    return;
                 }
+                return;
             }
 
             //更新