From 0e48cd386385110ea16ca05aae070f013c221f9a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 10:35:01 +0800
Subject: [PATCH] screen-manage 修改组织模块Bug
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 8307df0..e361433 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,15 +1,11 @@
package com.moral.api.controller;
import com.moral.api.pojo.dto.account.*;
-import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.form.account.AccountDeleteForm;
import com.moral.api.pojo.form.account.AccountInsertForm;
import com.moral.api.pojo.form.account.AccountQueryForm;
import com.moral.api.pojo.form.account.AccountUpdateForm;
-import com.moral.api.pojo.vo.account.AccountDeleteVO;
-import com.moral.api.pojo.vo.account.AccountInsertVO;
import com.moral.api.pojo.vo.account.AccountQueryVO;
-import com.moral.api.pojo.vo.account.AccountUpdateVO;
import com.moral.api.service.ManageAccountService;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -18,9 +14,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
@Slf4j
@Api(tags = {"������������������"})
@RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
@RequestMapping("/account")
public class AccountController {
@Autowired
@@ -34,7 +32,7 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- AccountInsertDTO conditionDTO = form.paramValid();
+ AccountDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
@@ -42,10 +40,7 @@
//������������������
AccountDTO dto = accountService.insertAccount(form);
- //������������������������
- AccountInsertVO accountInsertVO = AccountInsertVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), accountInsertVO);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("update")
@@ -56,7 +51,7 @@
ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
//������������������������
- AccountUpdateDTO conditionDTO = form.paramValid();
+ AccountDTO conditionDTO = form.paramValid();
if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
}
@@ -64,10 +59,7 @@
//������������������
AccountDTO dto = accountService.updateAccount(form);
- //���������������������������
- AccountUpdateVO vo = AccountUpdateVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@PostMapping("delete")
@@ -80,10 +72,7 @@
//������������������
AccountDTO dto = accountService.deleteAccount(form);
- //���������������������������
- AccountDeleteVO vo = AccountDeleteVO.convert(dto);
-
- return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ return new ResultMessage(dto.getCode(), dto.getMsg(), null);
}
@GetMapping("query")
@@ -102,9 +91,5 @@
return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
}
-
-
-
-
}
--
Gitblit v1.8.0