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

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampServiceImpl.java

@@ -112,6 +112,8 @@ public class OaStampServiceImpl implements OaStampService {
         List<Long> stampSealId = stagingReqVO.getStampSealId();
         if (CollectionUtil.isNotEmpty(stampSealId)) {
             oaStamp.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        } else {
+            oaStamp.setStampSealId(null);
         }
         // 暂存不保存审批人信息
         oaStamp.setStartUserSelectAssignees(null);
@@ -165,6 +167,8 @@ public class OaStampServiceImpl implements OaStampService {
         List<Long> stampSealId = commitReqVO.getStampSealId();
         if (CollectionUtil.isNotEmpty(stampSealId)) {
             oaStamp.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        } else {
+            oaStamp.setStampSealId(null);
         }
         // 保存或更新表单信息
         if (oaStamp.getId() == null) {
@@ -408,6 +412,8 @@ public class OaStampServiceImpl implements OaStampService {
         List<Long> stampSealId = reCommitReqVO.getStampSealId();
         if (CollectionUtil.isNotEmpty(stampSealId)) {
             oaStampNew.setStampSealId(stampSealId.stream().map(String::valueOf).collect(Collectors.joining(",")));
+        } else {
+            oaStampNew.setStampSealId(null);
         }
 
         Task currentTask = taskService.createTaskQuery().processInstanceId(oaStampNew.getProcInstId()).singleResult();
@@ -509,6 +515,8 @@ public class OaStampServiceImpl implements OaStampService {
             String[] stampSealIdArray = stampSealId.split(",");
             List<Long> stampSealIdList = Arrays.stream(stampSealIdArray).map(Long::valueOf).collect(Collectors.toList());
             oaStampRespVO.setStampSealId(stampSealIdList);
+        } else {
+            oaStampRespVO.setStampSealId(Collections.emptyList());
         }
 
         String procInstId = oaStampDO.getProcInstId();
@@ -576,6 +584,8 @@ public class OaStampServiceImpl implements OaStampService {
             String[] stampSealIdArray = stampSealId.split(",");
             List<Long> stampSealIdList = Arrays.stream(stampSealIdArray).map(Long::valueOf).collect(Collectors.toList());
             oaStampRespVO.setStampSealId(stampSealIdList);
+        } else {
+            oaStampRespVO.setStampSealId(Collections.emptyList());
         }
 
         // 附件列表

yudao-module-personnel/yudao-module-employee-biz/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>yudao-module-employee-api</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-system-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- 业务组件 -->
         <dependency>

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

@@ -5,6 +5,7 @@ import java.util.*;
 import java.io.IOException;
 
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
@@ -12,8 +13,11 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.employee.controller.admin.info.vo.*;
+import cn.iocoder.yudao.module.employee.convert.info.EmployeeConvert;
 import cn.iocoder.yudao.module.employee.dal.dataobject.info.EmployeeInfoDO;
 import cn.iocoder.yudao.module.employee.service.info.EmployeeInfoService;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -27,6 +31,7 @@ import javax.validation.Valid;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 @Tag(name = "管理后台 - 员工信息")
 @RestController
@@ -36,6 +41,8 @@ public class EmployeeInfoController {
 
     @Resource
     private EmployeeInfoService infoService;
+    @Resource
+    private DeptService deptService;
 
     @PostMapping("/create")
     @Operation(summary = "创建员工信息")
@@ -75,7 +82,14 @@ public class EmployeeInfoController {
     @PreAuthorize("@ss.hasPermission('employee:info:query')")
     public CommonResult<PageResult<EmployeeInfoRespVO>> getInfoPage(@Valid EmployeeInfoPageReqVO pageReqVO) {
         PageResult<EmployeeInfoDO> pageResult = infoService.getInfoPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, EmployeeInfoRespVO.class));
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+        // 拼接数据
+        Map<Long, DeptDO> deptMap = deptService.getDeptMap(
+                convertList(pageResult.getList(), EmployeeInfoDO::getDeptId));
+        return success(new PageResult<>(EmployeeConvert.INSTANCE.convertList(pageResult.getList(), deptMap),
+                pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/convert/info/EmployeeConvert.java

@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.employee.convert.info;
+
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.employee.controller.admin.info.vo.EmployeeInfoRespVO;
+import cn.iocoder.yudao.module.employee.dal.dataobject.info.EmployeeInfoDO;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+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 cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSimpleRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.social.SocialUserDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Mapper
+public interface EmployeeConvert {
+
+    EmployeeConvert INSTANCE = Mappers.getMapper(EmployeeConvert.class);
+
+    default List<EmployeeInfoRespVO> convertList(List<EmployeeInfoDO> list, Map<Long, DeptDO> deptMap) {
+        return list.stream()
+                .map(emp -> convert(emp, deptMap.getOrDefault(emp.getDeptId(), null)))
+                .collect(Collectors.toList());
+    }
+
+    default EmployeeInfoRespVO convert(EmployeeInfoDO emp, DeptDO dept) {
+        EmployeeInfoRespVO vo = BeanUtils.toBean(emp, EmployeeInfoRespVO.class);
+        if (dept != null) {
+            vo.setDeptName(dept.getName());
+        }
+        return vo;
+    }
+
+}

yudao-server/src/main/resources/application.yaml

@@ -212,6 +212,7 @@ yudao:
       - system_dict_type
       - system_error_code
       - system_menu
+      - system_menu_copy1
       - system_sms_channel
       - system_sms_template
       - system_sms_log