From c0249bd8cca7b3640217082dd91404b9e1ada0bc Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Mon, 23 May 2022 10:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysDeptConfigServiceImpl.java    | 15 ++++++++-------
 .../mapper/system/SysDeptConfigMapper.xml         |  4 +++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java b/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
index 96780361..14ca56e2 100644
--- a/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
+++ b/ghy-system/src/main/java/com/ghy/system/service/impl/SysDeptConfigServiceImpl.java
@@ -27,14 +27,15 @@ public class SysDeptConfigServiceImpl implements ISysDeptConfigService {
 
     @Override
     public SysDeptConfig selectByDeptId(Long deptId) {
+        return sysDeptConfigMapper.selectByDeptId(deptId);
 
-        SysDept dept = sysDeptMapper.selectDeptById(deptId);
-        if (StringUtils.isNotNull(dept) && StringUtils.isNotEmpty(dept.getAncestors())) {
-            Long targetDeptId = Long.parseLong(dept.getAncestors().split(",")[1]);
-            return sysDeptConfigMapper.selectByDeptId(targetDeptId);
-        } else {
-            throw new ServiceException("该用户的部门ID数据有误!");
-        }
+//        SysDept dept = sysDeptMapper.selectDeptById(deptId);
+//        if (StringUtils.isNotNull(dept) && StringUtils.isNotEmpty(dept.getAncestors())) {
+//            Long targetDeptId = Long.parseLong(dept.getAncestors().split(",")[1]);
+//            return sysDeptConfigMapper.selectByDeptId(targetDeptId);
+//        } else {
+//            throw new ServiceException("该用户的部门ID数据有误!");
+//        }
 
     }
 
diff --git a/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml b/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
index 3c4b139b..74be19ae 100644
--- a/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
+++ b/ghy-system/src/main/resources/mapper/system/SysDeptConfigMapper.xml
@@ -14,6 +14,8 @@
         <result property="adapayMaxRetryTimes"      column="adapay_max_retry_times"/>
         <result property="wxAppId"                  column="wx_app_id"/>
         <result property="wxSecret"                 column="wx_secret"/>
+        <result property="servWxAppId"                 column="serv_wx_app_id"/>
+        <result property="servWxSecret"                 column="serv_wx_secret"/>
         <result property="takeRate"                 column="take_rate"/>
         <result property="createBy"                 column="create_by"/>
         <result property="createTime"               column="create_time"/>
@@ -24,7 +26,7 @@
 
     <sql id="selectSysDeptConfig">
         SELECT sys_dept_config_id, dept_id, banner_url, adapay_app_id, adapay_api_key, adapay_mock_key,
-               adapay_rsa_private_key, adapay_max_retry_times, wx_app_id, wx_secret, take_rate,
+               adapay_rsa_private_key, adapay_max_retry_times, wx_app_id, wx_secret, serv_wx_app_id, serv_wx_secret, take_rate,
                create_by, create_time, update_by, update_time, remark
         FROM sys_dept_config
     </sql>