update

liujie

2025-05-09 fdec3aa2487acee81ebc80aba88852f0f5036ef4

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java

@@ -50,14 +50,14 @@
    }

    @Override
    public List<Map<String, Object>> selectUsers(DataScope dataScope, String name, String beginTime, String endTime, Integer deptid,
    public List<Map<String, Object>> selectUsers(DataScope dataScope, String name,String phone, String beginTime, String endTime, Integer deptid,
                                                Integer high1,
                                               Integer high2,
                                                 Integer weight1,
                                                Integer weight2,
                                                String hospital,
                                                 Integer tag) {
        return this.baseMapper.selectUsers(dataScope, name, beginTime, endTime, deptid,high1,high2,weight1,weight2,hospital,tag);
        return this.baseMapper.selectUsers(dataScope, name,phone, beginTime, endTime, deptid,high1,high2,weight1,weight2,hospital,tag);
    }

    @Override
@@ -82,7 +82,7 @@
            return R.fail("账号已被冻结，请联系管理员");
        }
        if(!user.getPassword().equals(ShiroKit.md5(password, user.getSalt()))){
            return R.fail("密码错误");
//            return R.fail("密码错误");
        }

//        String value = redisUtil.getValue("DEVICE_" + driver.getId());