打卡签到2

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInNoteServiceImpl.java

@@ -11,6 +11,7 @@ import com.wwdz.ch.db.dto.request.qiandao.QdUserSignInNoteRequestDto;
 import com.wwdz.ch.wx.entity.vo.qiandao.QdSignInNoteVo;
 import com.wwdz.ch.wx.service.qiandao.QdUserSignInNoteService;
 import com.xxdxxs.utils.EntityMapper;
+import com.xxdxxs.utils.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +58,9 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
             for (QdUserSignInNote qdUserSignInNote : qdUserSignInNoteList) {
                 QdSignInNoteVo qdSignInNoteVo = new QdSignInNoteVo();
                 EntityMapper.copyAttribute(qdUserSignInNote, qdSignInNoteVo);
-                qdSignInNoteVo.setImageList(Arrays.asList(qdUserSignInNote.getImage().split(";")));
+                if (StringUtils.hasLength(qdUserSignInNote.getImage())) {
+                    qdSignInNoteVo.setImageList(Arrays.asList(qdUserSignInNote.getImage().split(";")));
+                }
                 QdUser qdUser = qdUserDao.queryById(qdUserSignInNote.getUserId());
                 qdSignInNoteVo.setUserAvatar(qdSignInNoteVo.getUserAvatar());
                 qdSignInNoteVo.setUserName(qdUser.getNickName());
@@ -73,12 +76,14 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
                     uploadTime = "1小时内发布";
                 }
                 qdSignInNoteVo.setUploadTime(uploadTime);
-                SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
-                qdSignInNoteVo.setTaskName(signInTask.getName());
-                //查询当前用户是否点赞
-                if (dto.getUserId() != null) {
-                    qdGiveLikeRecordDao.isExisted(dto.getUserId(), qdUserSignInNote.getId());
-                    qdSignInNoteVo.setIsLike(true);
+                if (qdUserSignInNote.getTaskId() != null) {
+                    SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
+                    qdSignInNoteVo.setTaskName(signInTask.getName());
+                    //查询当前用户是否点赞
+                    if (dto.getUserId() != null) {
+                        qdGiveLikeRecordDao.isExisted(dto.getUserId(), qdUserSignInNote.getTaskId());
+                        qdSignInNoteVo.setIsLike(true);
+                    }
                 }
                 list.add(qdSignInNoteVo);
             }
@@ -96,7 +101,9 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
             QdUserSignInNote qdUserSignInNote = qdUserSignInNoteDao.findByNoteId(dto.getId());
             QdSignInNoteVo qdSignInNoteVo = new QdSignInNoteVo();
             EntityMapper.copyAttribute(qdUserSignInNote, qdSignInNoteVo);
-            qdSignInNoteVo.setImageList(Arrays.asList(qdUserSignInNote.getImage().split(";")));
+            if (StringUtils.hasLength(qdUserSignInNote.getImage())) {
+                qdSignInNoteVo.setImageList(Arrays.asList(qdUserSignInNote.getImage().split(";")));
+            }
             QdUser qdUser = qdUserDao.queryById(qdUserSignInNote.getUserId());
             qdSignInNoteVo.setUserAvatar(qdSignInNoteVo.getUserAvatar());
             qdSignInNoteVo.setUserName(qdUser.getNickName());
@@ -112,12 +119,14 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
                 uploadTime = "1小时内发布";
             }
             qdSignInNoteVo.setUploadTime(uploadTime);
-            SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
-            qdSignInNoteVo.setTaskName(signInTask.getName());
-            //查询当前用户是否点赞
-            if (dto.getUserId() != null) {
-                qdGiveLikeRecordDao.isExisted(dto.getUserId(), qdUserSignInNote.getId());
-                qdSignInNoteVo.setIsLike(true);
+            if (qdUserSignInNote.getTaskId() != null) {
+                SignInTask signInTask = signInTaskDao.findById(qdUserSignInNote.getTaskId());
+                qdSignInNoteVo.setTaskName(signInTask.getName());
+                //查询当前用户是否点赞
+                if (dto.getUserId() != null) {
+                    qdGiveLikeRecordDao.isExisted(dto.getUserId(), qdUserSignInNote.getTaskId());
+                    qdSignInNoteVo.setIsLike(true);
+                }
             }
             return Result.success(qdSignInNoteVo);
         } catch (Exception e) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/qiandao/QdUserSignInController.java

@@ -35,7 +35,7 @@ public class QdUserSignInController {
     @PostMapping("/signIn")
     public Object signIn(@RequestBody QdUserSignInRequestDto dto) {
         logger.info("【请求开始】乾岛签到,请求参数:{}", JSON.toJSONString(dto));
-        if (dto.getUserId() == null || dto.getTaskId() == null) {
+        if (dto.getUserId() == null) {
             return Result.failed(ResultCode.PARAM_ERROR);
         }
         return qdUserSignInService.signIn(dto);