Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -297,23 +297,29 @@ public class TaShareActivityController extends BaseController {
             map.put("taShareActivity",taShareActivity);
             
             //发起者团长信息
+            TaShareRecord taShareRecord = null;
              if (null != recordId){
-                 TaShareRecord taShareRecord = taShareRecordService.getById(recordId);
-                 if (null != taShareRecord){
-                     //团长
-                     taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
-                     map.put("taShareRecord",taShareRecord);
-        
-                     //团员
-                     QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
-                     childRecordQueryWrapper.eq("org_id",orgId);
-                     childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
-                     childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
-                     List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
-                     map.put("shareChildRecordList",shareChildRecordList);
-                 }
+                 taShareRecord = taShareRecordService.getById(recordId);
+             }else {
+                 QueryWrapper<TaShareRecord> recordQueryWrapper = new QueryWrapper<>();
+                 recordQueryWrapper.eq("org_id",orgId);
+                 recordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                 recordQueryWrapper.eq("person_id",person.getPersonId());
+                 taShareRecord = taShareRecordService.getOne(recordQueryWrapper);
              }
-            
+            if (null != taShareRecord){
+                //团长
+                taShareActivity.setGroupStatus(CommConstant.HELP_STATUS_INITIATE);
+                map.put("taShareRecord",taShareRecord);
+        
+                //团员
+                QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
+                childRecordQueryWrapper.eq("org_id",orgId);
+                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
+                List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                map.put("shareChildRecordList",shareChildRecordList);
+            }
     
             //获取海报信息
             QueryWrapper<TaPoster> posterQueryWrapper = new QueryWrapper<>();