From 6c203bfe05665157f043ca37023fe34b1c994668 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 10 Aug 2020 09:14:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 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 7e46bb3..341ba3c 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
@@ -73,14 +73,14 @@
// private final String HOSPITAL_ADMIN="hospital_admin";
@Override
- public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
+ public PageResult<SysDoctorDto> findList(Map<String, Object> params, SysUser user) {
Page<SysDoctor> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
//添加权限
SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
List<SysDoctor> list = baseMapper.findList(page, params);
- List<SysDoctorVo> listvo = new ArrayList<>();
+ List<SysDoctorDto> listvo = new ArrayList<>();
list.forEach(e -> {
- SysDoctorVo vo = new SysDoctorVo();
+ SysDoctorDto vo = new SysDoctorDto();
BeanCopier beanCopier = BeanCopier.create(SysDoctor.class, SysDoctorVo.class, false);
beanCopier.copy(e, vo, null);
//查询用户的登录账号；
@@ -89,10 +89,15 @@
if (sysUser != null) {
vo.setUsername(sysUser.getUsername());
}
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("user_id",e.getUserId());
+ List<SysRoleUser> roleUserList = sysUserRoleMapper.selectList(queryWrapper);
+ List<Long> collect = roleUserList.stream().map(roleUser -> roleUser.getRoleId()).collect(Collectors.toList());
+ vo.setRoles(collect);
}
listvo.add(vo);
});
- return PageResult.<SysDoctorVo>builder().data(listvo).code(0).count(page.getTotal()).build();
+ return PageResult.<SysDoctorDto>builder().data(listvo).code(0).count(page.getTotal()).build();
}
/**
@@ -183,12 +188,7 @@
return ResultBody.failed("选择一个角色");
}
}
- /**
- * 管理员只有一个
- */
- if (isSupperRole(sysDoctor)) {
- return ResultBody.failed("该部门已经有管理员");
- }
+
/**
* 限制只有创建医生的个数
*
@@ -201,7 +201,12 @@
if (sysDoctor.getId() == null) {
Long sysUserId = null;
//保存部门信息
- sysUserId = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment);
+ ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment);
+ if(resultBody.getCode()==0){
+ sysUserId=(Long)resultBody.getData();
+ }else {
+ return resultBody;
+ }
//保存doctor的数据
SysDoctor sysDoc = new SysDoctor();
BeanCopier beanCopier = BeanCopier.create(SysDoctorDto.class, SysDoctor.class, false);
@@ -246,7 +251,13 @@
if (isSupperRole(sysDoctor)) {
return ResultBody.failed("该部门已经有管理员");
}
- Long sysUserId = saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment);
+ ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment);
+ Long sysUserId = null;
+ if(resultBody.getCode()==0){
+ sysUserId=(Long)resultBody.getData();
+ }else {
+ return resultBody;
+ }
sysDoctor.setUserId(sysUserId);
baseMapper.updateById(sysDoctor);
} else if (getOne.getDoctorType() != 2 && sysDoctor.getDoctorType() == 2) {
@@ -260,8 +271,8 @@
queryWrapper.eq("user_id",getOne.getUserId());
int delete = sysUserRoleMapper.delete(queryWrapper);
if(byId!=null){
-// iSysUserService.delUser(byId.getId());
- boolean userdelete = iSysUserService.removeById(byId.getId());
+ byId.setDel(true);
+ boolean b1 = iSysUserService.updateById(byId);
}
redisUtils.hdel(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString());
sysDoctor.setUserId(null);
@@ -303,8 +314,14 @@
}
//保存的分接口
- public Long saveFenjiekou(SysDoctorDto sysDoctor, String id, SysHospital sysHospital, SysDepartment sysDepartment) {
+ public ResultBody saveFenjiekou(SysDoctorDto sysDoctor, String id, SysHospital sysHospital, SysDepartment sysDepartment) {
Long sysUserId = null;
+ /**
+ * 管理员只有一个
+ */
+ if (isSupperRole(sysDoctor)) {
+ return ResultBody.failed("该部门已经有管理员");
+ }
if (sysDoctor.getDoctorType() != 2) {
//保存
SysUser sysUser = new SysUser();
@@ -347,7 +364,7 @@
//保存到Redis
boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
}
- return sysUserId;
+ return ResultBody.ok().data(sysUserId);
}
@Override
--
Gitblit v1.8.0