From 6fd4bdff55620c562e0a22eee3c95924951b04a4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:28 +0800
Subject: [PATCH] Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index 1efe30b..2ad67ee 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -97,7 +97,7 @@
//查询 科室
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("org_id", sysUserOrg.getOrgId());
queryWrapper.eq("is_del", 0);
queryWrapper.eq("enabled", 1);
List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
@@ -136,7 +136,7 @@
//查询 科室
QueryWrapper queryWrapper = new QueryWrapper();
- queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
+ queryWrapper.eq("org_id", sysUserOrg.getOrgId());
queryWrapper.eq("is_del", 0);
queryWrapper.eq("enabled", 1);
List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
@@ -151,9 +151,9 @@
queryWrapper.eq("enabled", 1);
List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
if (!listHospital.isEmpty()) {
- sysUserOrgTemp.setFromId(listHospital.get(0).getId());
+ sysUserOrg.setFromId(listHospital.get(0).getId());
}
- sysUserOrgTemp.setFromLevel(1);
+ sysUserOrg.setFromLevel(1);
// sysUserOrg.setUpdateUserId(0L);
sysUserOrg.setOrgId(sysOrganization.getOrgParentId());
sysUserOrg.setCreateUserOrgCode(createUserOrgCode);
--
Gitblit v1.8.0