From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java | 46 +++-------------------------------------------
1 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 327e24a..1fc17af 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/company/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,55 +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.TWO}));
systemPermission.setDeleted(Boolean.FALSE);
return ApiResponse.success(systemPermissionService.findList(systemPermission));
}
--
Gitblit v1.9.3