Commit 6e350819a86cd9ddb5248009bc2d21dc5444ce59

Authored by zhangdaiscott
1 parent f1a2d565

解决2.3 所有类型的角色都没有编辑用户管理的权限 #1726

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -246,7 +246,7 @@ public class SysPermissionController { @@ -246,7 +246,7 @@ public class SysPermissionController {
246 * @param permission 246 * @param permission
247 * @return 247 * @return
248 */ 248 */
249 - @RequiresRoles({ "admin" }) 249 + //@RequiresRoles({ "admin" })
250 @RequestMapping(value = "/add", method = RequestMethod.POST) 250 @RequestMapping(value = "/add", method = RequestMethod.POST)
251 public Result<SysPermission> add(@RequestBody SysPermission permission) { 251 public Result<SysPermission> add(@RequestBody SysPermission permission) {
252 Result<SysPermission> result = new Result<SysPermission>(); 252 Result<SysPermission> result = new Result<SysPermission>();
@@ -266,7 +266,7 @@ public class SysPermissionController { @@ -266,7 +266,7 @@ public class SysPermissionController {
266 * @param permission 266 * @param permission
267 * @return 267 * @return
268 */ 268 */
269 - @RequiresRoles({ "admin" }) 269 + //@RequiresRoles({ "admin" })
270 @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST }) 270 @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
271 public Result<SysPermission> edit(@RequestBody SysPermission permission) { 271 public Result<SysPermission> edit(@RequestBody SysPermission permission) {
272 Result<SysPermission> result = new Result<>(); 272 Result<SysPermission> result = new Result<>();
@@ -286,7 +286,7 @@ public class SysPermissionController { @@ -286,7 +286,7 @@ public class SysPermissionController {
286 * @param id 286 * @param id
287 * @return 287 * @return
288 */ 288 */
289 - @RequiresRoles({ "admin" }) 289 + //@RequiresRoles({ "admin" })
290 @RequestMapping(value = "/delete", method = RequestMethod.DELETE) 290 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
291 public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) { 291 public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
292 Result<SysPermission> result = new Result<>(); 292 Result<SysPermission> result = new Result<>();
@@ -305,7 +305,7 @@ public class SysPermissionController { @@ -305,7 +305,7 @@ public class SysPermissionController {
305 * @param ids 305 * @param ids
306 * @return 306 * @return
307 */ 307 */
308 - @RequiresRoles({ "admin" }) 308 + //@RequiresRoles({ "admin" })
309 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) 309 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
310 public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { 310 public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
311 Result<SysPermission> result = new Result<>(); 311 Result<SysPermission> result = new Result<>();
@@ -403,7 +403,7 @@ public class SysPermissionController { @@ -403,7 +403,7 @@ public class SysPermissionController {
403 * @return 403 * @return
404 */ 404 */
405 @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST) 405 @RequestMapping(value = "/saveRolePermission", method = RequestMethod.POST)
406 - @RequiresRoles({ "admin" }) 406 + //@RequiresRoles({ "admin" })
407 public Result<String> saveRolePermission(@RequestBody JSONObject json) { 407 public Result<String> saveRolePermission(@RequestBody JSONObject json) {
408 long start = System.currentTimeMillis(); 408 long start = System.currentTimeMillis();
409 Result<String> result = new Result<>(); 409 Result<String> result = new Result<>();
@@ -683,7 +683,7 @@ public class SysPermissionController { @@ -683,7 +683,7 @@ public class SysPermissionController {
683 * @param sysPermissionDataRule 683 * @param sysPermissionDataRule
684 * @return 684 * @return
685 */ 685 */
686 - @RequiresRoles({ "admin" }) 686 + //@RequiresRoles({ "admin" })
687 @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST) 687 @RequestMapping(value = "/addPermissionRule", method = RequestMethod.POST)
688 public Result<SysPermissionDataRule> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { 688 public Result<SysPermissionDataRule> addPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
689 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>(); 689 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
@@ -698,7 +698,7 @@ public class SysPermissionController { @@ -698,7 +698,7 @@ public class SysPermissionController {
698 return result; 698 return result;
699 } 699 }
700 700
701 - @RequiresRoles({ "admin" }) 701 + //@RequiresRoles({ "admin" })
702 @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST }) 702 @RequestMapping(value = "/editPermissionRule", method = { RequestMethod.PUT, RequestMethod.POST })
703 public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) { 703 public Result<SysPermissionDataRule> editPermissionRule(@RequestBody SysPermissionDataRule sysPermissionDataRule) {
704 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>(); 704 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
@@ -718,7 +718,7 @@ public class SysPermissionController { @@ -718,7 +718,7 @@ public class SysPermissionController {
718 * @param id 718 * @param id
719 * @return 719 * @return
720 */ 720 */
721 - @RequiresRoles({ "admin" }) 721 + //@RequiresRoles({ "admin" })
722 @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE) 722 @RequestMapping(value = "/deletePermissionRule", method = RequestMethod.DELETE)
723 public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) { 723 public Result<SysPermissionDataRule> deletePermissionRule(@RequestParam(name = "id", required = true) String id) {
724 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>(); 724 Result<SysPermissionDataRule> result = new Result<SysPermissionDataRule>();
@@ -776,7 +776,7 @@ public class SysPermissionController { @@ -776,7 +776,7 @@ public class SysPermissionController {
776 * @return 776 * @return
777 */ 777 */
778 @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST) 778 @RequestMapping(value = "/saveDepartPermission", method = RequestMethod.POST)
779 - @RequiresRoles({ "admin" }) 779 + //@RequiresRoles({ "admin" })
780 public Result<String> saveDepartPermission(@RequestBody JSONObject json) { 780 public Result<String> saveDepartPermission(@RequestBody JSONObject json) {
781 long start = System.currentTimeMillis(); 781 long start = System.currentTimeMillis();
782 Result<String> result = new Result<>(); 782 Result<String> result = new Result<>();