修改了删除功能

feige

2024-06-02 7185db025a772630265cfd1a0410743e6e37ed05

修改了删除功能

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -246,13 +246,12 @@
    @PreAuthorize("@ss.hasPermi('system:user:remove')")
    @Log(title = "用户管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{userIds}")
    public AjaxResult remove(@PathVariable Long[] userIds)
    public AjaxResult remove(@PathVariable("userIds") Long[] userIds)
    {
        if (ArrayUtils.contains(userIds, getUserId()))
        {
            return error("当前用户不能删除");
        }
        zInfoUserService.removeByUserName( userService.findUserNames(userIds));
        return toAjax(userService.deleteUserByIds(userIds));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MemoBookController.java

@@ -51,6 +51,7 @@
    public AjaxResult updateData(@RequestBody MemoBook memoBook){
        boolean b = memoBookService.updateById(memoBook);
        if (b){
            System.out.println("sssddddddddddddddddddddddd");
            return AjaxResult.success();
        }else {
            return AjaxResult.error();

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -12,7 +12,7 @@
 */
public interface SysUserMapper
{
    public List<String> findUserNames(Long[] ids);
    public List<SysUser> findUserNames(Long[] ids);
    /**
     * 根据条件分页查询用户列表
     * 
@@ -87,6 +87,10 @@
     */
    public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);

    public int deleteUserByUserName(String userName);
    public int deleteUserByName(String userName);

    public int deleteById(Long[] userId);
    /**
     * 通过用户ID删除用户
     * 

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -73,7 +73,9 @@

    @Override
    public List<String> findUserNames(Long[] ids) {
        List<String> usNames = userMapper.findUserNames(ids);
        List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
                //.stream().map(SysUser::getUserName).collect(Collectors.toList());;
        System.out.println("99999999999900000000000");
        System.out.println(usNames);
                //.stream().map(SysUser::getUserName).collect(Collectors.toList());
        return usNames;
@@ -491,7 +493,29 @@
        userRoleMapper.deleteUserRole(userIds);
        // 删除用户与岗位关联
        userPostMapper.deleteUserPost(userIds);
        return userMapper.deleteUserByIds(userIds);
        //找到用户名
        List<String> unames = findUserNames(userIds);
        for(String name :unames) {
          //  System.out.println(name.equals(""));
         //   System.out.println(name==null);

         //   if(name!="" || name != null) {
                ZInfoUser fs = new ZInfoUser();
                fs.setNickName(name);
                List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);
                System.out.println("902");

                System.out.println(lis.size());
                if (!name.equals("") && lis.size() > 0)
                    userMapper.deleteUserByUserName(name);
                else
                    userMapper.deleteUserByName(name);
          //  }
        }

        return 1;
//        zInfoUserService.removeByUserName( findUserNames(userIds));

    }

    /**

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -67,7 +67,7 @@
    <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
        left join sys_dept d on u.dept_id = d.dept_id
        where u.del_flag = '0'
        where u.del_flag = '0' or u.del_flag = '2'
        <if test="userId != null and userId != 0">
            AND u.user_id = #{userId}
        </if>
@@ -215,12 +215,28 @@
         update sys_user set password = #{password} where user_name = #{userName}
    </update>
    
    <delete id="deleteUserByUserName" parameterType="String">
         update sys_user set status = '1' where user_name= #{userName}
     </delete>
    <delete id="deleteUserByName" parameterType="String">
        delete from sys_user where user_name= #{userName}
    </delete>

    <delete id="deleteUserById" parameterType="Long">
         update sys_user set del_flag = '2' where user_id = #{userId}
        update sys_user set status = '1' where user_id = #{userId}
    </delete>



    <delete id="deleteById" parameterType="Long">
        delete from sys_user where user_id in
        <foreach collection="array" item="userId" open="(" separator="," close=")">
            #{userId}
        </foreach>
     </delete>
     
     <delete id="deleteUserByIds" parameterType="Long">
         update sys_user set del_flag = '2' where user_id in
         update sys_user set status = '1' where user_id in
         <foreach collection="array" item="userId" open="(" separator="," close=")">
             #{userId}
        </foreach> 

 zhang-content/src/main/java/com/ruoyi/domain/MemoBook.java

@@ -35,8 +35,6 @@

    private String content;



    private String url;

}

 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -115,6 +115,7 @@
    public AjaxResult removeByUserName(List<String> userName) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.in(ZInfoUser::getNickName,String.valueOf(userName.get(0)));
        System.out.println(userName.get(0));
        List<ZInfoUser> beanRecords = list(lqw);
        System.out.println("555555555555555555"+beanRecords);
        List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList());;