From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java b/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
index 8ba7013..708f63f 100644
--- a/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
+++ b/Api/src/main/java/com/java110/api/listener/user/AddStaffServiceListener.java
@@ -13,6 +13,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.entity.center.AppService;
import com.java110.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.*;
@@ -160,13 +161,19 @@
//鏍￠獙json 鏍煎紡涓槸鍚﹀寘鍚� name,email,levelCd,tel
Assert.jsonObjectHaveKey(paramObj,"name","璇锋眰鍙傛暟涓湭鍖呭惈name 鑺傜偣锛岃纭");
- Assert.jsonObjectHaveKey(paramObj,"email","璇锋眰鍙傛暟涓湭鍖呭惈email 鑺傜偣锛岃纭");
+ //Assert.jsonObjectHaveKey(paramObj,"email","璇锋眰鍙傛暟涓湭鍖呭惈email 鑺傜偣锛岃纭");
Assert.jsonObjectHaveKey(paramObj,"tel","璇锋眰鍙傛暟涓湭鍖呭惈tel 鑺傜偣锛岃纭");
Assert.jsonObjectHaveKey(paramObj,"orgId", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈閮ㄩ棬淇℃伅");
Assert.jsonObjectHaveKey(paramObj,"address", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍦板潃淇℃伅");
Assert.jsonObjectHaveKey(paramObj,"sex", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鎬у埆淇℃伅");
Assert.jsonObjectHaveKey(paramObj,"relCd", "璇锋眰鎶ユ枃鏍煎紡閿欒鎴栨湭鍖呭惈鍛樺伐瑙掕壊");
+
+ if (paramObj.containsKey("email") && !StringUtil.isEmpty(paramObj.getString("email"))) {
+ Assert.isEmail(paramObj, "email", "涓嶆槸鏈夋晥鐨勯偖绠辨牸寮�");
+ }
+
+
JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_USER_INFO);
business.put(CommonConstant.HTTP_SEQ,1);
--
Gitblit v1.8.0