From a8de0c774a40a9436acd1009da8a38e7cda24157 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 14 Aug 2020 16:09:55 +0800
Subject: [PATCH] 修改页面小bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index cffd3c6..d78ce5d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.constant.DictionariesConstants;
@@ -111,22 +112,25 @@
/**
* 获取登录用户的一系列信息 hrj 06-04修改
*
- * @param sysUserNew
+ * @param sysUser
* @return
*/
@Override
- public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+ public LoginAppUser getLoginAppUser(SysUser sysUser) {
LoginAppUser loginAppUser = new LoginAppUser();
- SysUser sysUser = this.baseMapper.selectById(sysUserNew);
+ SysUser sysUserNew = this.baseMapper.selectById(sysUser);
if (sysUser != null) {
+ //返回的数据为什么要把密码也返回？清空!!
+ loginAppUser.setPassword("");
+ loginAppUser.setNewPassword("");
+ loginAppUser.setOldPassword("");
+
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
- loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
+ loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
- if (sysOrganizations != null) {
- loginAppUser.setOrganizations(sysOrganizations);
- }
+ loginAppUser.setOrganizations(sysOrganizations);
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
@@ -141,17 +145,16 @@
loginAppUser.setPermissions(permissions);
}
}
+ //是否医院管理员
+ com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
+ if (sysDoctor.getIsAdminUser() != null) {
+ loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
+ }
//医院信息 只有H端要返回的信息
if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
- //是否医院管理员
- loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
}
- //返回的数据为什么要把密码也返回？清空!!
- loginAppUser.setPassword("");
- loginAppUser.setNewPassword("");
- loginAppUser.setOldPassword("");
}
return loginAppUser;
}
@@ -402,7 +405,7 @@
organizationService.deleteByUserId(id);
//删除医生数据
Map<String, Object> params = new HashMap<>();
- params.put("userId", id);
+ params.put("user_id", id);
sysDoctorMapper.deleteByMap(params);
//删除用户数据
return baseMapper.deleteById(id) > 0;
@@ -461,6 +464,8 @@
@Override
public ResultBody findCountByMap(Map<String, Object> map) {
+ map.put("enable",1);
+ map.put("is_del",0);
Integer integer = baseMapper.selectCountByMap(map);
return ResultBody.ok().data(integer);
}
@@ -1030,4 +1035,20 @@
String encode = passwordEncoder.encode(password);
return ResultBody.ok().data(encode);
}
+
+ @Override
+ public boolean deleteNoContact(Long id) {
+ //删除医生数据
+ QueryWrapper<SysDoctor> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id", id);
+ List<SysDoctor> sysDoctors = sysDoctorMapper.selectList(queryWrapper);
+ if(!sysDoctors.isEmpty()){
+ sysDoctors.forEach(e->{
+ e.setIsDel(true);
+ sysDoctorMapper.updateById(e);
+ });
+ }
+ //删除用户数据
+ return baseMapper.deleteById(id) > 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0