From 22d199559342c1ccb3a0a8a5b5ee50e973819e16 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 19 一月 2024 11:31:19 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-再生俱乐部
---
phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java b/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
index ecd1b10..28d0439 100644
--- a/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
+++ b/phi_platform_user/src/main/java/com/hx/phip/controller/userompleteInfo/UserCompleteInfoController.java
@@ -118,6 +118,8 @@
sqlSentence.setSqlSentence(" select * from user_info where isDel = 0 and userId = #{m.userId} ");
UserInfo userInfo = commonService.selectOne(UserInfoMapper.class, sqlSentence);
+ //鏉ユ簮鍚嶇О
+ String sourceName = "";
if (userInfo != null) {
// userInfoMap.put("professionTypeName", userInfo.getProfessionTypeName());
userInfoMap.put("marriageTypeName", userInfo.getMarriageTypeName());
@@ -128,6 +130,7 @@
userInfoMap.put("mainAppeal", userInfo.getMainAppeal());
userInfoMap.put("minorAppeal", userInfo.getMinorAppeal());
userInfoMap.put("professionName", userInfo.getProfessionTypeName());
+ sourceName = userInfo.getSourceName();
//鏌ヨ瀵瑰簲鑱屼笟鏍囩
sqlSentence.sqlSentence("SELECT * FROM user_general_label where isDel = 0 and " +
" name in ('瀹ゅ唴涓轰富','闇�瑕佸鍑�','缁忓父鍑哄樊') and userId = #{m.userId} ORDER BY createTime desc limit 1",values);
@@ -173,8 +176,10 @@
}else {
userInfoMap.put("isExitsChannel", 0);
}
- //20231207 mot鎵爜鍒ゆ柇鐢ㄦ埛鏄惁鏈夋笭閬擄紝鏈夋笭閬撳垯涓嶄慨鏀�
- if(StringUtils.isEmpty(user.getChannelType(),user.getChannelType2()) ){
+ //20231207 mot鎵爜鍒ゆ柇鐢ㄦ埛鏄惁鏈夋笭閬擄紝鏈夋笭閬撴垨鏈夋潵婧愬悕绉板垯涓嶄慨鏀�
+
+
+ if(StringUtils.isEmpty(user.getChannelType()) && StringUtils.isEmpty(user.getChannelType2()) && StringUtils.isEmpty(sourceName)){
userInfoMap.put("isShowChannel", 0);
}else {
userInfoMap.put("isShowChannel", 1);
--
Gitblit v1.8.0