Browse Source

1、7681-资产管理-附件保存和回显

dongpo 6 months ago
parent
commit
3daabdfd8e

+ 10 - 4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/stamp/stampinfo/OaStampInfoController.java

@@ -128,13 +128,17 @@ public class OaStampInfoController {
             // 创建人名字
             Long createEmployeeId = oaStampInfoRespVO.getCreateEmployeeId();
             EmployeeRespDTO createEmployee = employeeApi.getEmployeeById(createEmployeeId);
-            oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getName());
+            if (createEmployee != null) {
+                oaStampInfoRespVO.setCreateEmployeeName(createEmployee.getName());
+            }
             // 用印人信息
             Long employeeId = oaStampInfoRespVO.getEmployeeId();
             // AdminUserRespDTO employee = adminUserApi.getUser(employeeId);
             EmployeeRespDTO employee = employeeApi.getEmployeeById(employeeId);
-            oaStampInfoRespVO.setEmployeeName(employee.getName());
-            oaStampInfoRespVO.setEmployeePhone(employee.getPhone());
+            if (employee != null) {
+                oaStampInfoRespVO.setEmployeeName(employee.getName());
+                oaStampInfoRespVO.setEmployeePhone(employee.getPhone());
+            }
             // 职位
             Long postId = oaStampInfoRespVO.getPostId();
             PostRespDTO post = postApi.getPost(postId);
@@ -144,7 +148,9 @@ public class OaStampInfoController {
             // 部门名称
             Long deptId = oaStampInfoRespVO.getDeptId();
             DeptRespDTO dept = deptApi.getDept(deptId);
-            oaStampInfoRespVO.setDeptName(dept.getName());
+            if (dept != null) {
+                oaStampInfoRespVO.setDeptName(dept.getName());
+            }
 
             // 附件
             List<FileDTO> fileDTOListByBiz = fileApi.getFileDTOListByBiz(oaStampInfo.getStampUuid());

+ 2 - 0
yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/AssetInfoController.java

@@ -115,6 +115,8 @@ public class AssetInfoController {
         // 附件
         List<FileDTO> fileDTOListByBiz = fileApi.getFileDTOListByBiz(info.getAssetInfoUuid());
         assetInfoRespVO.setFileList(fileDTOListByBiz);
+        List<Long> fileIdList = fileDTOListByBiz.stream().map(FileDTO::getId).collect(Collectors.toList());
+        assetInfoRespVO.setFileIdList(fileIdList);
 
         return success(assetInfoRespVO);
     }

+ 3 - 0
yudao-module-finance/yudao-module-asset-biz/src/main/java/cn/iocoder/yudao/module/asset/controller/admin/assetinfo/vo/AssetInfoRespVO.java

@@ -112,4 +112,7 @@ public class AssetInfoRespVO {
 
     @Schema(description = "附件列表")
     private List<FileDTO> fileList;
+
+    @Schema(description = "附件id列表")
+    private List<Long> fileIdList;
 }