From 6e1d704f0913b796bb41a7068896169fd2f26d75 Mon Sep 17 00:00:00 2001 From: zhangdaihao Date: Mon, 20 May 2019 11:49:24 +0800 Subject: [PATCH] =?UTF-8?q?V2.0=20=E7=89=88=E6=9C=AC=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E5=8E=BB=E6=8E=89=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BD=BF=E7=94=A8=E9=9A=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.解决SqlServer、oracle，demo表少sys_org_code字段 2.解决用户操作无权限问题，去掉权限注解 3.解决用户列表，无编辑按钮问题，去掉前端权限指令 --- ant-design-jeecg-vue/src/views/system/UserList.vue | 4 ++-- .../system/controller/SysUserController.java | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ant-design-jeecg-vue/src/views/system/UserList.vue b/ant-design-jeecg-vue/src/views/system/UserList.vue index 91f38989..9186b17f 100644 --- a/ant-design-jeecg-vue/src/views/system/UserList.vue +++ b/ant-design-jeecg-vue/src/views/system/UserList.vue @@ -118,9 +118,9 @@ - 编辑 + 编辑 - + diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 47ff8df2..2f8a3ee6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -13,8 +13,6 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PasswordUtil; @@ -24,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUserDepart; import org.jeecg.modules.system.entity.SysUserRole; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysUserDepartsVO; -import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysUserDepartService; import org.jeecg.modules.system.service.ISysUserRoleService; import org.jeecg.modules.system.service.ISysUserService; @@ -71,9 +68,6 @@ public class SysUserController { @Autowired private ISysUserService sysUserService; - @Autowired - private ISysDepartService sysDepartService; - @Autowired private ISysUserRoleService sysUserRoleService; @@ -96,7 +90,6 @@ public class SysUserController { } @RequestMapping(value = "/add", method = RequestMethod.POST) - @RequiresPermissions("user:add") public Result add(@RequestBody JSONObject jsonObject) { Result result = new Result(); String selectedRoles = jsonObject.getString("selectedroles"); @@ -119,7 +112,6 @@ public class SysUserController { } @RequestMapping(value = "/edit", method = RequestMethod.PUT) - @RequiresPermissions("user:edit") public Result edit(@RequestBody JSONObject jsonObject) { Result result = new Result(); try { @@ -145,7 +137,6 @@ public class SysUserController { /** * 删除用户 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { Result result = new Result(); @@ -170,7 +161,6 @@ public class SysUserController { /** * 批量删除用户 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper @@ -196,7 +186,6 @@ public class SysUserController { * @param jsonObject * @return */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) public Result frozenBatch(@RequestBody JSONObject jsonObject) { Result result = new Result(); @@ -300,7 +289,6 @@ public class SysUserController { /** * 修改密码 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/changPassword", method = RequestMethod.PUT) public Result changPassword(@RequestBody SysUser sysUser) { Result result = new Result(); @@ -475,7 +463,6 @@ public class SysUserController { * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - @RequiresPermissions("user:import") public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); @@ -528,7 +515,6 @@ public class SysUserController { /** * 首页密码修改 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) public Result changPassword(@RequestBody JSONObject json) { Result result = new Result();