Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-company/src/main/java/com/fs/company/controller/qw/QwUserController.java

@@ -199,7 +199,9 @@ public class QwUserController extends BaseController
             combinedList.add(deptId);
         }
         //本部门的下级部门
-        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+        //List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+        //本部门的全部下级部门
+        List<Long> deptList = companyDeptService.getCurrentDeptIdDownTreeIds(deptId);
         if (!deptList.isEmpty()){
             combinedList.addAll(deptList);
         }

fs-service/src/main/java/com/fs/company/service/ICompanyDeptService.java

@@ -91,4 +91,6 @@ public interface ICompanyDeptService
      * @return 部门
      */
     CompanyDept getDefaultCompanyDeptByCompanyId(Long companyId);
+
+    List<Long> getCurrentDeptIdDownTreeIds(Long deptId);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyDeptServiceImpl.java

@@ -249,6 +249,12 @@ public class CompanyDeptServiceImpl implements ICompanyDeptService
     public CompanyDept getDefaultCompanyDeptByCompanyId(Long companyId) {
         return companyDeptMapper.getTopCompanyDeptByCompanyId(companyId);
     }
+
+    @Override
+    public List<Long> getCurrentDeptIdDownTreeIds(Long deptId) {
+        return companyDeptMapper.getCurrentDeptIdDownTreeIds(deptId);
+    }
+
     /**
      * 递归列表
      */

fs-service/src/main/resources/application-druid-zlwh.yml

@@ -44,11 +44,10 @@ spring:
                   password: Ylrztek250218!3@.
                 # 从库数据源
                 slave:
-                    # 从数据源开关/默认关闭
-                    enabled: false
-                    url:
-                    username:
-                    password:
+                    master:
+                    url: jdbc:mysql://192.168.0.7:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                    username: root
+                    password: Ylrztek250218!3@.
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量