From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java b/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
index f0ae43f..5fc0a4e 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ResponsibilityUnitController.java
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -68,7 +69,6 @@
*/
@PostMapping("update")
public ResultMessage updateUnit(@RequestBody ResponsibilityUnit responsibilityUnit){
-
Integer integer = responsibilityUnitService.updateUnit(responsibilityUnit);
if (integer<0){
return ResultMessage.fail(ResponseCodeEnum.ROLE_IS_EXIST.getCode(),ResponseCodeEnum.ROLE_IS_EXIST.getMsg());
@@ -78,41 +78,41 @@
/**
* ������������
- * @param id
+ * @param unitId
* @return
*/
@GetMapping("state")
- public ResultMessage state(Integer id){
- if (ObjectUtils.isEmpty(id)){
+ public ResultMessage state(Integer unitId){
+ if (ObjectUtils.isEmpty(unitId)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- responsibilityUnitService.updateState(id);
+ responsibilityUnitService.updateState(unitId);
return ResultMessage.ok();
}
/**
* ������������
- * @param id
+ * @param unitId
* @param code
* @return
*/
@GetMapping("invalid")
- public ResultMessage invalid(Integer id,String code){
- if (ObjectUtils.isEmpty(id)){
+ public ResultMessage invalid(Integer unitId,String code){
+ if (ObjectUtils.isEmpty(unitId)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
- responsibilityUnitService.updateInvalid(id,code);
+ responsibilityUnitService.updateInvalid(unitId,code);
return ResultMessage.ok();
}
/**
* ������������
- * @param id
+ * @param unitId
* @return
*/
@GetMapping("delete")
- public ResultMessage delete(Integer id){
- responsibilityUnitService.removeById(id);
+ public ResultMessage delete(Integer unitId){
+ responsibilityUnitService.removeById(unitId);
return ResultMessage.ok();
}
}
--
Gitblit v1.8.0