From 0fe02f3eace81653ae47cf89ea019010df8b3423 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 10:03:52 +0800
Subject: [PATCH] 优化套餐功能
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index 6be917c..f5a92fc 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -246,28 +246,32 @@
}
}
Map<String, Object> columnMap = new HashMap<>();
- columnMap.put("user_id", sysDoctor.getUserId());
+ columnMap.put("user_id", getOne.getUserId());
boolean b = sysUserOrgService.removeByMap(columnMap);
//保存将sys_user_org
SysUserOrg sysUserOrg = new SysUserOrg();
sysUserOrg.setUserId(getOne.getUserId());
- sysUserOrg.setEnabled(false);
+ sysUserOrg.setEnabled(true);
sysUserOrg.setFromId(sysDoctor.getDepartmentId());
sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
sysUserOrg.setOrgId(sysDepartment.getOrgId());
sysUserOrg.setCreateTime(new Date());
+ List<SysUserOrg> sysUserOrgs=new ArrayList<>();
+ sysUserOrgs.add(sysUserOrg);
sysUserOrgService.saveOrUpdate(sysUserOrg);
SysUserOrg sysGongsi = new SysUserOrg();
- sysGongsi.setUserId(getOne.getId());
+ sysGongsi.setUserId(getOne.getUserId());
sysGongsi.setOrgId(sysHospital.getOrgId());
sysGongsi.setFromId(sysDoctor.getHospitalId());
- sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
+ sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL);
+ sysGongsi.setEnabled(true);
+ sysUserOrgs.add(sysGongsi);
sysUserOrgService.saveOrUpdate(sysGongsi);
baseMapper.updateById(sysDoctor);
if (redisUtils.hHasKey(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString())) {
redisUtils.hdel(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString());
}
- redisUtils.hset(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString(), sysUserOrg);
+ redisUtils.hset(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString(), sysUserOrgs);
//角色更换
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("user_id", getOne.getUserId());
@@ -415,12 +419,14 @@
sysRoleUser.setUserId(sysUser.getId());
int insert = sysUserRoleMapper.insert(sysRoleUser);
});
+ List<SysUserOrg> sysUserOrgs=new ArrayList<>();
//保存将sys_user_org 保存部门
SysUserOrg sysUserOrg = new SysUserOrg();
sysUserOrg.setUserId(sysUser.getId());
sysUserOrg.setFromId(sysDoctor.getDepartmentId());
sysUserOrg.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
sysUserOrg.setOrgId(sysDepartment.getOrgId());
+ sysUserOrgs.add(sysUserOrg);
//保存公司
sysUserOrgService.saveOrUpdate(sysUserOrg);
SysUserOrg sysGongsi = new SysUserOrg();
@@ -429,8 +435,9 @@
sysGongsi.setFromId(sysDoctor.getHospitalId());
sysGongsi.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
sysUserOrgService.saveOrUpdate(sysGongsi);
+ sysUserOrgs.add(sysGongsi);
//保存到Redis
- boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
+ boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrgs);
}
return ResultBody.ok().data(sysUserId);
}
--
Gitblit v1.8.0