From fe9e3a7e341f4979beb09d287a5ee761c660e728 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:54:19 +0800
Subject: [PATCH] screen-manage 添加组织返回字段
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 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 be45676..53620af 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,13 +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;
@@ -17,6 +15,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
@Slf4j
@Api(tags = {"������������������"})
@@ -35,7 +34,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);
}
@@ -43,10 +42,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")
@@ -57,7 +53,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);
}
@@ -65,10 +61,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")
@@ -81,10 +74,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")
@@ -103,9 +93,5 @@
return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
}
-
-
-
-
}
--
Gitblit v1.8.0