From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb
---
screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
index b90948c..36908c1 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java
@@ -67,9 +67,9 @@
ObjectUtils.isEmpty(areaCode) &&
ObjectUtils.isEmpty(locationLevelCode) &&
ObjectUtils.isEmpty(address) &&
- ObjectUtils.isEmpty(phone) &&
- ObjectUtils.isEmpty(email) &&
- ObjectUtils.isEmpty(wechat) &&
+ phone==null &&
+ email==null &&
+ wechat==null &&
ObjectUtils.isEmpty(expireTime)
)
return false;
--
Gitblit v1.8.0