Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java

@@ -210,6 +210,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
         SignInRecResultDTO resultDTO = new SignInRecResultDTO();
         resultDTO.setSignedInNum(originalActInfo.getSignedInNum());
         resultDTO.setShouldAttend(originalActInfo.getShouldAttend());
+        resultDTO.setList(new ArrayList<>());
         List<ActSignInRecordEntity> list = baseDao.selectListByGroupActId(formDTO.getGroupActId());
         if (!CollectionUtils.isEmpty(list)) {
             //2.调用user服务，查询人员基础数据
@@ -229,6 +230,7 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
                             signInDetail.setSignInTime(l.getCreatedTime());
                             signInDetail.setSignUserId(l.getSignUserId());
                             signInDetail.setSignUserName(user.getSurname().concat(user.getName()));
+                            signInDetailList.add(signInDetail);
                         }
                     });
                 });