From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
index 9f8ab55..2dca4cf 100644
--- a/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
+++ b/ycl-common/src/main/java/com/ycl/utils/listener/DepartListener.java
@@ -7,8 +7,10 @@
 import com.ycl.entity.depart.UmsDepart;
 import com.ycl.mapper.depart.UmsDepartMapper;
 import com.ycl.mapper.dict.DataDictionaryMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import java.util.Objects;
 
@@ -17,10 +19,17 @@
 
     @Resource
     private UmsDepartMapper sccgDepartMapper;
-
     @Resource
-    DataDictionaryMapper dataDictionaryMapper;
+    private DataDictionaryMapper dataDictionaryMapper;
 
+//    private static DepartListener departListener;
+//
+//    @PostConstruct
+//    public void init(){
+//        departListener = this;
+//        departListener.sccgDepartMapper = this.sccgDepartMapper;
+//        departListener.dataDictionaryMapper = this.dataDictionaryMapper;
+//    }
 
     @Override
     public void invoke(UmsDepartDto umsDepartDto, AnalysisContext analysisContext) {
@@ -40,10 +49,12 @@
         umsDepart.setDepartDes(umsDepartDto.getDepartDes());
 
         //  璁剧疆閮ㄩ棬绫诲瀷
-//        LambdaQueryWrapper<DataDictionary> dataDictionaryLambdaQueryWrapper = new LambdaQueryWrapper<DataDictionary>(DataDictionary::getName, umsDepartDto.getDepartTypeName());
-////        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper(DataDictionary));
-////        sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>(UmsDepart::getDepartType))
-////        umsDepart.setDepartType(umsDepartDto.getDepartType());
+        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getName, umsDepartDto.getDepartType()));
+        if (Objects.isNull(dataDictionary)){
+            throw new RuntimeException("閮ㄩ棬绫诲瀷涓嶅瓨鍦�");
+        }else {
+            umsDepart.setDepartType(new Long(dataDictionary.getId()).intValue());
+        }
 
         //  璁剧疆鐖秈d
         UmsDepart two = sccgDepartMapper.selectOne(new LambdaQueryWrapper<UmsDepart>().eq(UmsDepart::getDepartName, umsDepartDto.getParentDepartName()));

--
Gitblit v1.8.0