33 Commits

Author SHA1 Message Date
疯狂的狮子li
d3a3ad5cbd update 简化查询用户功能 2022-03-04 11:45:38 +08:00
疯狂的狮子li
b2d3abd9d6 update 优化去除sql差异化 时间范围统一使用 between 处理 2022-03-03 11:18:10 +08:00
疯狂的狮子li
911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li
a0bed51d96 update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
2022-01-13 09:58:16 +08:00
疯狂的狮子li
4e04f5e967 remove 移除过期代码 数据权限 2021-12-28 14:32:53 +08:00
疯狂的狮子li
6c4882b907 update 注释遗漏 老版本数据权限 2021-12-28 14:27:59 +08:00
疯狂的狮子Li
aae3fe5305 update [重大更新] 重写数据权限实现 2021-12-13 03:49:05 +00:00
疯狂的狮子li
c7c9bd6b08 fix 修复 用户逻辑删除 差异问题 2021-11-04 18:49:46 +08:00
疯狂的狮子li
0c438ad8e9 update 修改时检查用户数据权限范围 2021-08-26 11:15:07 +08:00
疯狂的狮子li
31c2cfa53c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
2021-08-26 11:10:42 +08:00
RuoYi
e52092c6d4 修改时检查用户数据权限范围 2021-08-24 16:00:39 +08:00
疯狂的狮子li
59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00
疯狂的狮子li
aa14085746 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2021-07-06 12:01:05 +08:00
RuoYi
90c41d498c 角色管理新增分配用户功能 2021-07-05 14:54:09 +08:00
疯狂的狮子li
0860934888 update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 21:52:15 +08:00
疯狂的狮子li
06513446a0 update 还原数据权限修改 2021-05-29 19:44:33 +08:00
疯狂的狮子li
8d761fa60c update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:54:35 +08:00
疯狂的狮子li
b7bd67b4cb update 优化数据权限sql 解决MP apply注入附带 AND 语法问题 2021-05-29 18:41:32 +08:00
疯狂的狮子li
f01bb5966a update 使用 MP 分页工具 重构业务 2021-05-13 21:25:51 +08:00
疯狂的狮子li
48d61a3cdf update mp化 2021-04-14 11:19:46 +08:00
疯狂的狮子li
4500db395f update ruoyi原生改为 MP lombok 格式
update SysConfig 模块代码
2021-04-12 17:02:55 +08:00
疯狂的狮子li
8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
2021-04-08 17:12:13 +08:00
wangze
ba5ab4b091 用户、角色单条删除时,使其逻辑删除 2021-04-02 22:49:19 +08:00
疯狂的狮子li
e9d368ed0c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
2020-12-30 16:20:09 +08:00
li_oxen
a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 2020-12-29 13:51:15 +08:00
疯狂的狮子li
e80349c343 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
2020-12-04 11:46:29 +08:00
RuoYi
ef92ad4d8c 支持get请求映射params参数 2020-12-04 10:52:20 +08:00
疯狂的狮子li
298fabfdec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
	ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/tool/gen.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
2020-09-18 17:38:23 +08:00
RuoYi
0ecf27f8d6 去除多余的空格 2020-09-18 17:09:27 +08:00
疯狂的狮子li
a9f4a4e111 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/utils/ruoyi.js
2020-08-07 09:22:36 +08:00
RuoYi
51fa66f61a 唯一限制条件只返回单条数据 2020-08-05 14:28:45 +08:00
疯狂的狮子li
1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi
cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00