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

yudao-module-personnel/yudao-module-employee-api/src/main/java/cn/iocoder/yudao/module/employee/api/dto/EmployeeRespDTO.java

@@ -118,5 +118,9 @@ public class EmployeeRespDTO {
      * 员工状态
      */
     private String employeeStatus;
+    /**
+     * 性别
+     */
+    private String gender;
 
 }

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

@@ -224,6 +224,9 @@ public class EmployeeInfoController {
         // 员工状态
         List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList("employee_status");
         Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
+        // 性别
+        List<DictDataRespDTO> genderDictDataList = dictDataApi.getDictDataList("system_user_sex");
+        Map<String, String> genderDictDataMap = CollectionUtils.convertMap(genderDictDataList, DictDataRespDTO::getValue, DictDataRespDTO::getLabel);
         if (respVOList != null && respVOList.size() > 0) {
             respVOList.forEach(respVO -> {
                 // 如果部门ID不为空，则尝试获取部门详细信息
@@ -251,6 +254,13 @@ public class EmployeeInfoController {
                         respVO.setEmployeeStatusDesc(employeeStatusDesc);
                     }
                 }
+                // 性别
+                if (StrUtil.isNotBlank(respVO.getGender())) {
+                    String genderDesc = genderDictDataMap.get(respVO.getGender());
+                    if (StrUtil.isNotBlank(genderDesc)) {
+                        respVO.setGenderDesc(genderDesc);
+                    }
+                }
             });
         }
         // 导出 Excel

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

@@ -70,6 +70,10 @@ public class EmployeeInfoRespVO {
     @Schema(description = "性别")
     private String gender;
 
+    @Schema(description = "性别")
+    @ExcelProperty("性别")
+    private String genderDesc;
+
     @Schema(description = "电子邮箱")
     private String email;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java

@@ -46,7 +46,6 @@ public class RoleRespVO {
     private String remark;
 
     @Schema(description = "数据范围，参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("数据范围")
     private Integer dataScope;
 
     @Schema(description = "数据范围(指定部门数组)", example = "1")

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

@@ -4,6 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
+import cn.iocoder.yudao.module.employee.api.EmployeeApi;
+import cn.iocoder.yudao.module.employee.api.dto.EmployeeRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileResetPasswordReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
@@ -23,6 +26,7 @@ import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -55,6 +59,8 @@ public class UserProfileController {
     private RoleService roleService;
     @Resource
     private SocialUserService socialService;
+    @Resource
+    private EmployeeApi employeeApi;
 
     @GetMapping("/get")
     @Operation(summary = "获得登录用户信息")
@@ -62,6 +68,12 @@ public class UserProfileController {
     public CommonResult<UserProfileRespVO> getUserProfile() {
         // 获得用户基本信息
         AdminUserDO user = userService.getUser(getLoginUserId());
+        EmployeeRespDTO loginEmployee = employeeApi.getEmployeeByUserId(getLoginUserId());
+        if (user.getSex() == null) {
+            if (loginEmployee != null && StringUtils.isNotBlank(loginEmployee.getGender())) {
+                user.setSex(Integer.valueOf(loginEmployee.getGender()));
+            }
+        }
         // 获得用户角色
         List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(user.getId()));
         // 获得部门信息