|
|
@@ -4,6 +4,7 @@ import com.izouma.nineth.domain.MetaTask;
|
|
|
import com.izouma.nineth.domain.MetaTaskToUser;
|
|
|
import com.izouma.nineth.domain.MetaUserTaskProgress;
|
|
|
import com.izouma.nineth.dto.MetaRestResult;
|
|
|
+import com.izouma.nineth.dto.MetaServiceResult;
|
|
|
import com.izouma.nineth.dto.PageQuery;
|
|
|
import com.izouma.nineth.enums.MetaTaskStatus;
|
|
|
import com.izouma.nineth.enums.MetaTaskTarget;
|
|
|
@@ -12,6 +13,7 @@ import com.izouma.nineth.repo.MetaTaskRepo;
|
|
|
import com.izouma.nineth.repo.MetaTaskToUserRepo;
|
|
|
import com.izouma.nineth.repo.MetaUserTaskProgressRepo;
|
|
|
import com.izouma.nineth.utils.JpaUtils;
|
|
|
+import com.izouma.nineth.utils.MetaUtils;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -51,6 +53,10 @@ public class MetaUserTaskProgressService {
|
|
|
if (Objects.isNull(metaUserTaskProgress.getUserId())) {
|
|
|
return MetaRestResult.returnError("Illegal parameter : userId can not be null");
|
|
|
}
|
|
|
+ MetaServiceResult result = MetaUtils.checkUserExcludeTourist(metaUserTaskProgress.getUserId());
|
|
|
+ if (!result.isSuccess()) {
|
|
|
+ return MetaRestResult.returnError(result.getMessage());
|
|
|
+ }
|
|
|
// 指定备注唯一,校验是否重复
|
|
|
if (metaUserTaskProgress.isRemarkOnly()) {
|
|
|
if (StringUtils.isBlank(metaUserTaskProgress.getRemark())) {
|