From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
index 15245d1..68a9712 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/collect/service/impl/UserCollectServiceImpl.java
@@ -1,5 +1,6 @@
 package cn.gistack.sm.collect.service.impl;
 
+import cn.gistack.sm.collect.vo.CollectVO;
 import cn.gistack.sm.collect.entity.UserCollect;
 import cn.gistack.sm.collect.mapper.UserCollectMapper;
 import cn.gistack.sm.collect.service.IUserCollectService;
@@ -7,9 +8,10 @@
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 @Service
 public class UserCollectServiceImpl extends BaseServiceImpl<UserCollectMapper, UserCollect> implements IUserCollectService {
@@ -21,7 +23,7 @@
 	}
 
 	@Override
-	public Boolean updateCollect(UserCollect userCollect) {
+	public String updateCollect(UserCollect userCollect) {
 		if (ObjectUtil.isEmpty(userCollect.getUserId())){
 			userCollect.setUserId(AuthUtil.getUserId().toString());
 		}
@@ -37,13 +39,18 @@
 		UserCollect detail = baseMapper.selectOne(Condition.getQueryWrapper(params));
 		if (ObjectUtil.isEmpty(detail)){
 			//库里不存在该数据就新增
-			return save(userCollect);
+			save(userCollect);
 		}else {
 			//更新收藏状态
 			detail.setStatus(userCollect.getStatus());
-			return updateById(detail);
+			 updateById(detail);
 		}
+		return baseMapper.getMyCollect(userCollect.getUserId());
+	}
 
+	@Override
+	public List<CollectVO> getMyCollectVO(String userId) {
+		return baseMapper.getMyCollectVO(userId);
 	}
 
 

--
Gitblit v1.9.3