魏超 5 年之前
父節點
當前提交
f6d7f2112b

+ 12
- 8
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java 查看文件

8
 import com.huiju.estateagents.entity.*;
8
 import com.huiju.estateagents.entity.*;
9
 import com.huiju.estateagents.po.TaHousingResourcesPO;
9
 import com.huiju.estateagents.po.TaHousingResourcesPO;
10
 import com.huiju.estateagents.service.*;
10
 import com.huiju.estateagents.service.*;
11
+import org.apache.commons.collections.CollectionUtils;
11
 import org.apache.commons.lang3.StringUtils;
12
 import org.apache.commons.lang3.StringUtils;
12
 import org.slf4j.Logger;
13
 import org.slf4j.Logger;
13
 import org.slf4j.LoggerFactory;
14
 import org.slf4j.LoggerFactory;
274
                     }
275
                     }
275
                 });
276
                 });
276
                 //我的认筹和锁定
277
                 //我的认筹和锁定
277
-                taRaiseHouseList.forEach(r -> {
278
-                    //我的认筹
279
-                    if (e.getHouseId().equals(r.getHouseId())) {
280
-                        e.setMineRaise("mine");
281
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
282
-                            e.setMineLocked("mine");
278
+                if (CollectionUtils.isNotEmpty(taRaiseRecordList)){
279
+                    taRaiseHouseList.forEach(r -> {
280
+                        //我的认筹
281
+                        if (e.getHouseId().equals(r.getHouseId())) {
282
+                            e.setMineRaise("mine");
283
+                            if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
284
+                                e.setMineLocked("mine");
285
+                            }
283
                         }
286
                         }
284
-                    }
285
-                });
287
+                    });
288
+                }
289
+
286
 
290
 
287
                 //塞入户型信息
291
                 //塞入户型信息
288
                 if (!StringUtils.isEmpty(e.getApartmentId())) {
292
                 if (!StringUtils.isEmpty(e.getApartmentId())) {

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPersonVisitRecordServiceImpl.java 查看文件

159
 			taPersonQueryWrapper.eq("user_id", e.getSharePersonId());
159
 			taPersonQueryWrapper.eq("user_id", e.getSharePersonId());
160
 			TaPerson taPersonUser = taPersonMapper.selectOne(taPersonQueryWrapper);
160
 			TaPerson taPersonUser = taPersonMapper.selectOne(taPersonQueryWrapper);
161
 
161
 
162
-			e.setShareName(userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
163
-			e.setShareTel(userShareInfo == null ? taPersonUser.getPhone() :userShareInfo.getPhone());
162
+			e.setShareName((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
163
+			e.setShareTel((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getPhone(): userShareInfo.getPhone());
164
 
164
 
165
 			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
165
 			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
166
 				e.setActivityName(e.getDrainageName());
166
 				e.setActivityName(e.getDrainageName());