From 52d8cf200d7a54890845d4c468c24b6ab97a4762 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 06 May 2021 14:41:34 +0800
Subject: [PATCH] screen-manage 前台用户增加以及删除功能
---
screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index d7ac38c..34f5fe5 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -10,7 +10,7 @@
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.api.pojo.dto.organization.OrganizationQueryDTO;
-import com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO;
+import com.moral.api.pojo.dto.organization.OrganizationQueryNamesDTO;
import com.moral.api.pojo.form.organization.*;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,7 +19,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
-import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Service;
@@ -30,7 +29,6 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
-import java.util.function.Predicate;
/**
* <p>
@@ -128,14 +126,14 @@
//form���entity
Organization organization = organizationUpdateForm.formConvertEntity();
- //������������������������
- QueryWrapper<Organization> existWrapper = new QueryWrapper<>();
- Organization existOrganization = new Organization();
- existOrganization.setId(organization.getId());
- existOrganization.setIsDelete(Constants.NOT_DELETE);
- existWrapper.setEntity(existOrganization);
- existOrganization = organizationMapper.selectOne(existWrapper);
- if (ObjectUtils.isEmpty(existOrganization)) {
+ //������������������������������������������
+ QueryWrapper<Organization> oldWrapper = new QueryWrapper<>();
+ Organization oldOrganization = new Organization();
+ oldOrganization.setId(organization.getId());
+ oldOrganization.setIsDelete(Constants.NOT_DELETE);
+ oldWrapper.setEntity(oldOrganization);
+ oldOrganization = organizationMapper.selectOne(oldWrapper);
+ if (ObjectUtils.isEmpty(oldOrganization)) {
organizationDTO.setCode(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode());
organizationDTO.setMsg(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
return organizationDTO;
@@ -170,7 +168,7 @@
organizationDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
//������������������
- insertUpdateLog(organizationUpdateForm, organization, existOrganization);
+ insertUpdateLog(organizationUpdateForm, organization, oldOrganization);
return organizationDTO;
}
@@ -236,6 +234,8 @@
organizationMapper.update(null, updateWrapper);
}
}
+
+ //������������������������
//������������������
dto.setOrganization(existOrganization);
@@ -338,20 +338,17 @@
}
/**
- * @Description: ������������������������������Id���������������
- * @Param: [organizationQueryNameForm]
+ * @Description: ������������������������������Id
+ * @Param: []
* @return: com.moral.api.pojo.dto.organization.OrganizationQueryNameDTO
* @Author: ���������
* @Date: 2021/4/13
*/
@Override
- public OrganizationQueryNameDTO queryOrganizationNames(OrganizationQueryNameForm form) {
- OrganizationQueryNameDTO dto = new OrganizationQueryNameDTO();
- //������
- String name = form.getName();
+ public OrganizationQueryNamesDTO queryNames(OrganizationQueryNamesForm from) {
+ OrganizationQueryNamesDTO dto = new OrganizationQueryNamesDTO();
//������������������
- NullFilterWrapper<Organization> queryWrapper = new NullFilterWrapper();
- queryWrapper.like("name", name);
+ QueryWrapper<Organization> queryWrapper = new QueryWrapper();
queryWrapper.eq("is_delete", Constants.NOT_DELETE);
//������
List<Organization> organizations = organizationMapper.selectList(queryWrapper);
--
Gitblit v1.8.0