From 0972f16bb4354539f782d9f91db83bd9f3b87471 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 28 Sep 2023 10:33:34 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
index f6b223a..2704560 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AllocationController.java
@@ -18,6 +18,7 @@
import com.moral.constant.PageResult;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.Field;
@@ -62,16 +63,6 @@
}
- @ApiOperation(value = "������������", notes = "������������")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
- })
- @RequestMapping(value = "unit", method = RequestMethod.GET)
- public ResultMessage unit() {
- List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
- return ResultMessage.ok(responsibilityUnits);
- }
-
/**
* ���������������
* @return
@@ -84,15 +75,7 @@
}
- /**
- * ���������������
- * @return
- */
- /* @GetMapping("check")
- public ResultMessage check(Integer id){
- allocationService.check(id);
- return ResultMessage.ok();
- }*/
+
/**
* ������������
@@ -121,15 +104,7 @@
allocationService.checkAllocation(checkCond);
return ResultMessage.ok();
}
- /**
- * ������������������
- * @return
- */
- @GetMapping("selectAll")
- public ResultMessage selectAll(Map<String,Object> map){
- allocationService.selectAll(map);
- return ResultMessage.ok();
- }
+
@PostMapping("/page")
@ApiOperation("������")
@@ -180,7 +155,7 @@
public ResultMessage selectUnitView(HttpServletRequest request){
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
Map<String, Object> map1 = allocationService.selectUnitView(params);
- return ResultMessage.ok(map1);
+ return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
}
--
Gitblit v1.8.0