From 63aab08cd422e940bf27a6908acd0e93a4df3a5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 17 六月 2025 08:53:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java | 49 ++++---------------------------------------------
1 files changed, 4 insertions(+), 45 deletions(-)
diff --git a/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 327e24a..4e1a289 100644
--- a/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/shop/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.vo.SystemPermissionListVO;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -36,56 +38,13 @@
@Autowired
private SystemPermissionBiz systemPermissionBiz;
- @PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("system:permission:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
- return ApiResponse.success(systemPermissionBiz.create(systemPermission));
- }
-
- @ApiOperation("鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("system:permission:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- systemPermissionBiz.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("system:permission:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String [] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- systemPermissionBiz.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("system:permission:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
- systemPermissionBiz.updateById(systemPermission);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("system:permission:query")
- public ApiResponse<PageData<SystemPermissionListVO>> findPage (@RequestBody PageWrap<QuerySystemPermissionDTO> pageWrap) {
- return ApiResponse.success(systemPermissionService.findPage(pageWrap));
- }
-
@ApiOperation("鏌ヨ鎵�鏈�")
@GetMapping("/all")
@RequiresPermissions("system:permission:query")
public ApiResponse<List<SystemPermission>> findAll () {
SystemPermission systemPermission = new SystemPermission();
+// systemPermission.setTypeList(Arrays.asList(new Integer[]{Constants.ZERO,Constants.THREE}));
systemPermission.setDeleted(Boolean.FALSE);
- return ApiResponse.success(systemPermissionService.findList(systemPermission));
+ return ApiResponse.success(systemPermissionService.findList(systemPermission,getLoginUser().getType()));
}
}
--
Gitblit v1.9.3