From c864fec5f798a1aabcde877469886dd0dc90d092 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 13:54:18 +0800
Subject: [PATCH] 申请表getAll接口可以根据通行证状态查询
---
src/main/java/org/springblade/modules/enterprise/wrapper/EnterpriseWrapper.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/enterprise/wrapper/EnterpriseWrapper.java b/src/main/java/org/springblade/modules/enterprise/wrapper/EnterpriseWrapper.java
index ca6afa5..e817c01 100644
--- a/src/main/java/org/springblade/modules/enterprise/wrapper/EnterpriseWrapper.java
+++ b/src/main/java/org/springblade/modules/enterprise/wrapper/EnterpriseWrapper.java
@@ -18,6 +18,7 @@
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.enterprise.entity.EnterpriseEntity;
import org.springblade.modules.enterprise.vo.EnterpriseVO;
import java.util.Objects;
@@ -36,14 +37,19 @@
@Override
public EnterpriseVO entityVO(EnterpriseEntity enterprise) {
- EnterpriseVO enterpriseVO = Objects.requireNonNull(BeanUtil.copy(enterprise, EnterpriseVO.class));
+ if (ObjectUtil.isNotEmpty(enterprise)){
+ EnterpriseVO enterpriseVO = Objects.requireNonNull(BeanUtil.copy(enterprise, EnterpriseVO.class));
- //User createUser = UserCache.getUser(enterprise.getCreateUser());
- //User updateUser = UserCache.getUser(enterprise.getUpdateUser());
- //enterpriseVO.setCreateUserName(createUser.getName());
- //enterpriseVO.setUpdateUserName(updateUser.getName());
+ //User createUser = UserCache.getUser(enterprise.getCreateUser());
+ //User updateUser = UserCache.getUser(enterprise.getUpdateUser());
+ //enterpriseVO.setCreateUserName(createUser.getName());
+ //enterpriseVO.setUpdateUserName(updateUser.getName());
- return enterpriseVO;
+ return enterpriseVO;
+ }else {
+ return null;
+ }
+
}
--
Gitblit v1.9.3