diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8fa76a63..26785037 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,11 @@
+
+
-
+
+
@@ -172,7 +175,7 @@
-
+
diff --git a/src/main/java/com/lz/modules/app/entity/UserEntity.java b/src/main/java/com/lz/modules/app/entity/UserEntity.java
index b6a3bec6..c335a1da 100644
--- a/src/main/java/com/lz/modules/app/entity/UserEntity.java
+++ b/src/main/java/com/lz/modules/app/entity/UserEntity.java
@@ -22,7 +22,7 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com
*/
@Data
-@TableName("sys_user")
+@TableName("tb_user")
public class UserEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -32,10 +32,6 @@ public class UserEntity implements Serializable {
@TableId
private Long userId;
- private String realName;
-
- private String userNo;
-
private String status;
/**
* 用户名
diff --git a/src/main/java/com/lz/modules/sys/controller/SysRoleController.java b/src/main/java/com/lz/modules/sys/controller/SysRoleController.java
index be0a63ee..1e712941 100644
--- a/src/main/java/com/lz/modules/sys/controller/SysRoleController.java
+++ b/src/main/java/com/lz/modules/sys/controller/SysRoleController.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2020 fumeiai All rights reserved.
- *
- *
- *
+ *
+ *
+ *
* 版权所有，侵权必究！
*/
@@ -32,98 +32,98 @@ import java.util.Map;
@RestController
@RequestMapping("/sys/role")
public class SysRoleController extends AbstractController {
- @Autowired
- private SysRoleService sysRoleService;
- @Autowired
- private SysRoleMenuService sysRoleMenuService;
+ @Autowired
+ private SysRoleService sysRoleService;
+ @Autowired
+ private SysRoleMenuService sysRoleMenuService;
- /**
- * 角色列表
- */
- @GetMapping("/list")
- @RequiresPermissions("sys:role:list")
- public R list(@RequestParam Map params){
- //如果不是超级管理员，则只查询自己创建的角色列表
- if(getUserId() != Constant.SUPER_ADMIN){
- params.put("createUserId", getUserId());
- }
+ /**
+ * 角色列表
+ */
+ @GetMapping("/list")
+ @RequiresPermissions("sys:role:list")
+ public R list(@RequestParam Map params) {
+ //如果不是超级管理员，则只查询自己创建的角色列表
+// if(getUserId() != Constant.SUPER_ADMIN){
+// params.put("createUserId", getUserId());
+// }
- PageUtils page = sysRoleService.queryPage(params);
+ PageUtils page = sysRoleService.queryPage(params);
- return R.ok().put("page", page);
- }
+ return R.ok().put("page", page);
+ }
- /**
- * 角色列表
- */
- @GetMapping("/select")
- @RequiresPermissions("sys:role:select")
- public R select(){
- Map map = new HashMap<>();
+ /**
+ * 角色列表
+ */
+ @GetMapping("/select")
+ @RequiresPermissions("sys:role:select")
+ public R select() {
+ Map map = new HashMap<>();
- //如果不是超级管理员，则只查询自己所拥有的角色列表
- if(getUserId() != Constant.SUPER_ADMIN){
- map.put("create_user_id", getUserId());
- }
- List list = (List) sysRoleService.listByMap(map);
+ //如果不是超级管理员，则只查询自己所拥有的角色列表
+// if(getUserId() != Constant.SUPER_ADMIN){
+// map.put("create_user_id", getUserId());
+// }
+ List list = (List) sysRoleService.listByMap(map);
- return R.ok().put("list", list);
- }
+ return R.ok().put("list", list);
+ }
- /**
- * 角色信息
- */
- @GetMapping("/info/{roleId}")
- @RequiresPermissions("sys:role:info")
- public R info(@PathVariable("roleId") Long roleId){
- SysRoleEntity role = sysRoleService.getById(roleId);
+ /**
+ * 角色信息
+ */
+ @GetMapping("/info/{roleId}")
+ @RequiresPermissions("sys:role:info")
+ public R info(@PathVariable("roleId") Long roleId) {
+ SysRoleEntity role = sysRoleService.getById(roleId);
- //查询角色对应的菜单
- List menuIdList = sysRoleMenuService.queryMenuIdList(roleId);
- role.setMenuIdList(menuIdList);
+ //查询角色对应的菜单
+ List menuIdList = sysRoleMenuService.queryMenuIdList(roleId);
+ role.setMenuIdList(menuIdList);
- return R.ok().put("role", role);
- }
+ return R.ok().put("role", role);
+ }
- /**
- * 保存角色
- */
- @SysLog("保存角色")
- @PostMapping("/save")
- @RequiresPermissions("sys:role:save")
- public R save(@RequestBody SysRoleEntity role){
- ValidatorUtils.validateEntity(role);
+ /**
+ * 保存角色
+ */
+ @SysLog("保存角色")
+ @PostMapping("/save")
+ @RequiresPermissions("sys:role:save")
+ public R save(@RequestBody SysRoleEntity role) {
+ ValidatorUtils.validateEntity(role);
- role.setCreateUserId(getUserId());
- sysRoleService.saveRole(role);
+ role.setCreateUserId(getUserId());
+ sysRoleService.saveRole(role);
- return R.ok();
- }
+ return R.ok();
+ }
- /**
- * 修改角色
- */
- @SysLog("修改角色")
- @PostMapping("/update")
- @RequiresPermissions("sys:role:update")
- public R update(@RequestBody SysRoleEntity role){
- ValidatorUtils.validateEntity(role);
+ /**
+ * 修改角色
+ */
+ @SysLog("修改角色")
+ @PostMapping("/update")
+ @RequiresPermissions("sys:role:update")
+ public R update(@RequestBody SysRoleEntity role) {
+ ValidatorUtils.validateEntity(role);
- role.setCreateUserId(getUserId());
- sysRoleService.update(role);
+ role.setCreateUserId(getUserId());
+ sysRoleService.update(role);
- return R.ok();
- }
+ return R.ok();
+ }
- /**
- * 删除角色
- */
- @SysLog("删除角色")
- @PostMapping("/delete")
- @RequiresPermissions("sys:role:delete")
- public R delete(@RequestBody Long[] roleIds){
- sysRoleService.deleteBatch(roleIds);
+ /**
+ * 删除角色
+ */
+ @SysLog("删除角色")
+ @PostMapping("/delete")
+ @RequiresPermissions("sys:role:delete")
+ public R delete(@RequestBody Long[] roleIds) {
+ sysRoleService.deleteBatch(roleIds);
- return R.ok();
- }
+ return R.ok();
+ }
}
diff --git a/target/classes/com/lz/modules/app/entity/UserEntity.class b/target/classes/com/lz/modules/app/entity/UserEntity.class
index 4bb6a850..8ee09521 100644
Binary files a/target/classes/com/lz/modules/app/entity/UserEntity.class and b/target/classes/com/lz/modules/app/entity/UserEntity.class differ
diff --git a/target/classes/com/lz/modules/sys/controller/SysRoleController.class b/target/classes/com/lz/modules/sys/controller/SysRoleController.class
index b2634ad6..7c6ad435 100644
Binary files a/target/classes/com/lz/modules/sys/controller/SysRoleController.class and b/target/classes/com/lz/modules/sys/controller/SysRoleController.class differ