From 75a17f4f267353633a2dd21004ed23d435b79bf6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 12 八月 2024 18:03:41 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index badce48..9e94814 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -109,7 +109,12 @@
return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
}
if(null ==tjDwGrouping.getPayType()|| tjDwGrouping.getPayType().equals(""))return AjaxResult.error("璇烽�夋嫨缁撶畻鏂瑰紡!!!");
- tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());
+
+ TjDwDept dwDept = dwDeptService.getById(tjDwGrouping.getDwDeptId());
+ if(null !=dwDept){
+ tjDwGrouping.setDwDeptName(dwDept.getDwDeptName());
+ }
+ tjDwGrouping.setDwName(compService.getById(tjDwGrouping.getDwId()).getCnName());
if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
// groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId()));
--
Gitblit v1.8.0