From 4d5eff3b824dac8e50400b2ec1114cba4ed6a87c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 07 Apr 2021 17:05:43 +0800
Subject: [PATCH] screen-manage     完成sysarea模块查询     拦截器逻辑代码完成     修改organization和accountBug

---
 screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
index 6a0cf90..66cd6bb 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/OrganizationController.java
@@ -12,6 +12,7 @@
 import com.moral.api.pojo.vo.organization.OrganizationQueryVO;
 import com.moral.api.pojo.vo.organization.OrganizationUpdateVO;
 import com.moral.api.service.OrganizationService;
+import com.moral.api.util.LogUtils;
 import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
@@ -31,17 +32,16 @@
  **/
 @Slf4j
 @Api(tags = {"���������������������"})
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
-    @RequestMapping("/organization")
+@RequestMapping("/organization")
 public class OrganizationController {
     @Autowired
     OrganizationService organizationService;
 
     @PostMapping("insert")
-    @OperationLogAnno(module = Constants.ORGANIZATION_MODULE_NAME,type = Constants.INSERT_OPERATE_TYPE)
     public ResultMessage insert(@RequestBody OrganizationInsertForm form, HttpServletRequest request) {
-        //������������������request���
-        request.setAttribute("parameters",form);
+
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -59,11 +59,12 @@
         //���������������������������
         OrganizationInsertVO vo = OrganizationInsertVO.convert(dto);
 
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
     }
 
     @PostMapping("update")
-    public ResultMessage update(@RequestBody OrganizationUpdateForm form){
+    public ResultMessage update(@RequestBody OrganizationUpdateForm form, HttpServletRequest request) {
+
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -81,11 +82,11 @@
         //���������������������������
         OrganizationUpdateVO vo = OrganizationUpdateVO.convert(dto);
 
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
     }
 
     @PostMapping("delete")
-    public ResultMessage delete(@RequestBody OrganizationDeleteForm form){
+    public ResultMessage delete(@RequestBody OrganizationDeleteForm form,HttpServletRequest request) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -97,11 +98,11 @@
         //���������������������������
         OrganizationDeleteVO vo = OrganizationDeleteVO.convert(dto);
 
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
     }
 
     @GetMapping("query")
-    public ResultMessage query(OrganizationQueryForm form){
+    public ResultMessage query(OrganizationQueryForm form) {
         //������������������������
         if (!form.valid())
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -113,7 +114,7 @@
         //������������������������
         OrganizationQueryVO vo = OrganizationQueryVO.convert(dto);
 
-        return new ResultMessage(dto.getCode(),dto.getMsg(),vo);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
     }
 
 }

--
Gitblit v1.8.0