From 6faad9fedf817f6b6be9ab7a2094bef1020a3ba9 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Tue, 11 Apr 2023 19:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E8=A1=97=E9=81=93?=
 =?UTF-8?q?=E3=80=91=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=96=87=E7=AB=A0=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AEcurd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-voice/gov-voice-server/pom.xml               | 4 ++--
 .../java/com/epmet/controller/CategoryDictController.java     | 2 ++
 .../src/main/java/com/epmet/service/CategoryDictService.java  | 2 +-
 .../java/com/epmet/service/impl/CategoryDictServiceImpl.java  | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml
index d52b79a73e..561b92a4d6 100644
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-server/pom.xml
@@ -164,8 +164,8 @@
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt_lsjd@@</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>root</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java
index fae386fced..4bb60ce451 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/CategoryDictController.java
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Map;
 
 
 /**
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java
index 40fb125ae6..a2932c37b2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/CategoryDictService.java
@@ -87,4 +87,4 @@ public interface CategoryDictService extends BaseService<CategoryDictEntity> {
     List<CategoryDictDTO> list(Integer pageNo, Integer pageSize);
 
     List<CategoryDictDTO> listSubCategories(String parentCategoryId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java
index f0f2cb5d58..8708e64250 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java
@@ -139,6 +139,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl<CategoryDictDao, Ca
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
         // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
         List<String> idList = Arrays.asList(ids);
 
         List<Boolean> idList2Del = idList.stream().map(id -> {
@@ -155,6 +156,7 @@ public class CategoryDictServiceImpl extends BaseServiceImpl<CategoryDictDao, Ca
 
     @Override
     public List<CategoryDictDTO> list(Integer pageNo, Integer pageSize) {
+        List<CategoryDictEntity> list = baseDao.selectList(null);
         LambdaQueryWrapper<CategoryDictEntity> query = new LambdaQueryWrapper<>();
         query.eq(CategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId());
         List<CategoryDictEntity> list = baseDao.selectList(query);
@@ -169,4 +171,4 @@ public class CategoryDictServiceImpl extends BaseServiceImpl<CategoryDictDao, Ca
         List<CategoryDictEntity> list = baseDao.selectList(query);
         return ConvertUtils.sourceToTarget(list, CategoryDictDTO.class);
     }
-}
\ No newline at end of file
+}