From 5df2a2026692a36f564166b2a830de526381c128 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期日, 09 十月 2022 17:32:14 +0800
Subject: [PATCH] bug修改

---
 ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java       |    1 +
 ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java |    6 +++---
 ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java          |    2 +-
 ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java  |    8 ++++----
 ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java                        |    4 ++--
 ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java                             |    2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
index 1d38845..8e280bb 100644
--- a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
+++ b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java
@@ -38,13 +38,13 @@
     private String departDes;
 
     @ApiModelProperty("閮ㄩ棬绫诲瀷")
-    private byte departType;
+    private Long departType;
 
     @ApiModelProperty("鐖剁骇id,榛樿0")
     private Long parentId;
 
     @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤")
-    private byte status;
+    private Short status;
 
     /**
      * 閫昏緫鍒犻櫎 0:false 1:true 榛樿0
diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
index 0d55321..e1f2837 100644
--- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java
@@ -51,6 +51,7 @@
         }
         UmsDepart depart = new UmsDepart();
         BeanUtils.copyProperties(addDepartVO, depart);
+        depart.setStatus(Short.valueOf("1"));
         if (sccgDepartMapper.insert(depart) != 1) {
             throw new ApiException(ResultCode.RECORD_SAVE_FAIL);
         }
diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
index d1639f4..a110b27 100644
--- a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
@@ -100,7 +100,7 @@
         private String departDes;
 
         @ApiModelProperty("閮ㄩ棬绫诲瀷")
-        private byte departType;
+        private Long departType;
 
         @ApiModelProperty("鐢ㄦ埛Id")
         private Long userId;
diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
index 79df82e..1dd4338 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java
@@ -37,9 +37,9 @@
     }
 
     @GetMapping("/queryByCode")
-    @ApiOperation(("/鏍规嵁code鑾峰彇瀛楁淇℃伅"))
-    private CommonResult<DataDictionary> queryByCode(@RequestParam(value = "code") String code){
-        DataDictionary dataDictionary = iDatabaseDictionaryService.queryByCode(code);
+    @ApiOperation(("鏍规嵁code鑾峰彇瀛楁淇℃伅"))
+    private CommonResult<List<DataDictionary>> queryByCode(@RequestParam(value = "code") String code){
+        List<DataDictionary> dataDictionary = iDatabaseDictionaryService.queryByCode(code);
         return CommonResult.success(dataDictionary);
     }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
index 3e5d198..2eac3e0 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
@@ -27,7 +27,7 @@
      * @param code
      * @return
      */
-    DataDictionary queryByCode(String code);
+    List<DataDictionary> queryByCode(String code);
 
     Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
 
diff --git a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
index 1ac3334..7672d25 100644
--- a/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -49,22 +49,22 @@
     }
 
     @Override
-    public DataDictionary queryByCode(String code) {
+    public List<DataDictionary> queryByCode(String code) {
         LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>().eq(DataDictionary::getTypeCode, code);
-        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
+        List<DataDictionary> dataDictionary = dataDictionaryMapper.selectList(queryWrapper);
         return dataDictionary;
     }
 
     @Override
     public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
-        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage,keyWord);
+        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage, keyWord);
         return dataDictionaryPageList;
     }
 
     @Override
     public Page listViolations(Page<ViolationSettingVO> dataDictionaryPage, String keyWord) {
         dataDictionaryPage.setOptimizeCountSql(false);
-        Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
+        Page<ViolationSettingVO> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage, keyWord);
         return dataDictionaryPageList;
     }
 }

--
Gitblit v1.8.0