diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java index 916faeb7..fa42acc3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java @@ -1,12 +1,12 @@ package org.jeecg.modules.system.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.system.entity.SysUser; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.vo.SysUserDepVo; @@ -133,14 +133,14 @@ public interface SysUserMapper extends BaseMapper { * @param entity * @return int */ - int revertLogicDeleted(@Param("userIds") String userIds, @Param("entity") SysUser entity); + int revertLogicDeleted(@Param("userIds") List userIds, @Param("entity") SysUser entity); /** * 彻底删除被逻辑删除的用户 * @param userIds 多个用户id * @return int */ - int deleteLogicDeleted(@Param("userIds") String userIds); + int deleteLogicDeleted(@Param("userIds") List userIds); /** * 更新空字符串为null【此写法有sql注入风险,禁止随便用】 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml index 7328a2dd..60888930 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml @@ -92,6 +92,8 @@ sys_user.id AS id, sys_user.realname AS realname, sys_user.avatar AS avatar, + sys_user.sex AS sex, + sys_user.birthday AS birthday, sys_user.work_no AS workNo, sys_user.post AS post, sys_user.telephone AS telephone, @@ -141,12 +143,18 @@ update_time = #{entity.updateTime} WHERE del_flag = 1 - AND id IN (${userIds}) + AND id IN + + #{userId} + - DELETE FROM sys_user WHERE del_flag = 1 AND id IN (${userIds}) + DELETE FROM sys_user WHERE del_flag = 1 AND id IN + + #{userId} + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index c9e14c76..df40e8f2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -459,16 +459,14 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value={CacheConstant.SYS_USERS_CACHE}, allEntries=true) public boolean revertLogicDeleted(List userIds, SysUser updateEntity) { - String ids = String.format("'%s'", String.join("','", userIds)); - return userMapper.revertLogicDeleted(ids, updateEntity) > 0; + return userMapper.revertLogicDeleted(userIds, updateEntity) > 0; } @Override @Transactional(rollbackFor = Exception.class) public boolean removeLogicDeleted(List userIds) { - String ids = String.format("'%s'", String.join("','", userIds)); // 1. 删除用户 - int line = userMapper.deleteLogicDeleted(ids); + int line = userMapper.deleteLogicDeleted(userIds); // 2. 删除用户部门关系 line += sysUserDepartMapper.delete(new LambdaQueryWrapper().in(SysUserDepart::getUserId, userIds)); //3. 删除用户角色关系