From 9bf891d878ae6edabc770609350daa60d8c41d8b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 27 Oct 2023 17:03:38 +0800
Subject: [PATCH] fix：管理员登陆
---
screen-api/src/main/java/com/moral/api/controller/AllocationController.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 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..62e2ce0 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
@@ -12,12 +12,14 @@
import com.moral.api.pojo.ext.allocation.AllocationPageExt;
import com.moral.api.pojo.query.allocation.*;
import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
+import com.moral.api.pojo.vo.allocation.AllocationFindVo;
import com.moral.api.pojo.vo.allocation.AllocationPageVo;
import com.moral.api.pojo.vo.allocation.AllocationVo;
import com.moral.api.utils.BeanConverts;
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;
@@ -61,7 +63,6 @@
return ResultMessage.ok(professions);
}
-
@ApiOperation(value = "������������", notes = "������������")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
@@ -71,6 +72,7 @@
List<ResponsibilityUnit> responsibilityUnits = allocationService.seleteUnit();
return ResultMessage.ok(responsibilityUnits);
}
+
/**
* ���������������
@@ -84,15 +86,7 @@
}
- /**
- * ���������������
- * @return
- */
- /* @GetMapping("check")
- public ResultMessage check(Integer id){
- allocationService.check(id);
- return ResultMessage.ok();
- }*/
+
/**
* ������������
@@ -121,15 +115,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 +166,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);
}
@@ -212,4 +198,6 @@
}
}
+
+
}
--
Gitblit v1.8.0