Merge remote-tracking branch 'origin/master_20240722' into lc_saas

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/controller/admin/info/EmployeeInfoController.java

@@ -212,9 +212,32 @@ public class EmployeeInfoController {
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<EmployeeInfoDO> list = infoService.getInfoPage(pageReqVO).getList();
+        List<EmployeeInfoRespVO> respVOList = BeanUtils.toBean(list, EmployeeInfoRespVO.class);
+        if (respVOList != null && respVOList.size() > 0) {
+            respVOList.forEach(respVO -> {
+                // 如果部门ID不为空，则尝试获取部门详细信息
+                Long deptId = respVO.getDeptId();
+                if (deptId != null) {
+                    DeptDO dept = deptService.getDept(deptId);
+                    // 如果成功获取到部门信息，则设置部门名称到员工信息中
+                    if (dept != null) {
+                        respVO.setDeptName(dept.getName());
+                    }
+                }
+                // 如果职位ID不为空，则尝试获取职位详细信息
+                Long postId = respVO.getPostId();
+                if (postId != null) {
+                    PostDO post = postService.getPost(postId);
+                    // 如果成功获取到职位信息，则设置职位名称到员工信息中
+                    if (post != null) {
+                        respVO.setPosition(post.getName());
+                    }
+                }
+            });
+        }
         // 导出 Excel
         ExcelUtils.write(response, "员工信息.xls", "数据", EmployeeInfoRespVO.class,
-                        BeanUtils.toBean(list, EmployeeInfoRespVO.class));
+                respVOList);
     }
 
 }

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/controller/admin/info/vo/EmployeeInfoHistorySaveReqVO.java

@@ -154,7 +154,6 @@ public class EmployeeInfoHistorySaveReqVO {
     private Long tenantId;
 
     @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4877")
-    @NotNull(message = "用户ID不能为空")
     private Long userId;
 
     @Schema(description = "关联员工ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4352")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -128,8 +128,6 @@ public class AuthController {
             dto.setPosition(employee.getPosition());
             // 设置员工手机号
             dto.setMobile(employee.getPhone());
-        } else {
-            return success(null, "员工信息为空");
         }
 
         TenantDO tenantDO = tenantService.getTenant(dto.getTenantId()); // 获得租户信息，用于判断是否需要切换租户