From f5416d4f90125564a4e2281c011e6001fd5842bd Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Thu, 20 Aug 2020 16:58:19 +0800
Subject: [PATCH] 修改设为管理员失败
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 3 +++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 10 ++++++----
3 files changed, 10 insertions(+), 5 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 7598b03..47c9e83 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
@@ -465,8 +465,9 @@
sysRoleUser.setRoleId(CommonConstant.HOSPITAL_DOCTOR_ID);
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("user_id", adminId);
- queryWrapper.eq("role_id", CommonConstant.HOSPITAL_ADMIN_ID);
- int update = sysUserRoleMapper.update(sysRoleUser, queryWrapper);
+// queryWrapper.eq("role_id", CommonConstant.HOSPITAL_ADMIN_ID);
+ int delete = sysUserRoleMapper.delete(queryWrapper);
+ int update = sysUserRoleMapper.insert(sysRoleUser);
//现将操作人员设为非管理角色
sysDoctor.setIsAdminUser(false);
if (baseMapper.updateById(sysDoctor) > 0) {
@@ -480,8 +481,9 @@
sysRoleUser.setRoleId(CommonConstant.HOSPITAL_ADMIN_ID);
queryWrapper = new QueryWrapper();
queryWrapper.eq("user_id", sysDoctor.getUserId());
- queryWrapper.eq("role_id", CommonConstant.HOSPITAL_DOCTOR_ID);
- sysUserRoleMapper.update(sysRoleUser, queryWrapper);
+// queryWrapper.eq("role_id", CommonConstant.HOSPITAL_DOCTOR_ID);
+ sysUserRoleMapper.delete(queryWrapper);
+ sysUserRoleMapper.insert(sysRoleUser);
sysDoctor.setIsAdminUser(true);
if (baseMapper.updateById(sysDoctor) > 0) {
return ResultBody.ok().data(true).msg("管理员设置成功！");
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 f874488..5a70f5d 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
@@ -473,7 +473,7 @@
@Override
public ResultBody findCountByMap(Map<String, Object> map) {
map.put("enable",1);
- map.put("is_del",0);
+ map.put("isDel",0);
Integer integer = baseMapper.selectCountByMap(map);
return ResultBody.ok().data(integer);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index a2c36bd..92c1dac 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -36,6 +36,9 @@
</sql>
<sql id="where_map">
<where>
+ <if test="u.isDel != null">
+ and t.is_del = #{u.isDel}
+ </if>
<if test="u.id != null and u.id != ''">
and t.id like concat('%', #{u.id}, '%')
</if>
--
Gitblit v1.8.0