From f26e519f6e95bec42144d31fcef154789f464898 Mon Sep 17 00:00:00 2001 From: "ryan.xu" Date: Fri, 25 Apr 2025 17:23:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=A5=E4=BB=B7=E5=91=98=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=8F=AA=E8=83=BD=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DecorationMeasureServiceImpl.java | 2 -- .../store/service/impl/DecorationServiceImpl.java | 1 - .../service/impl/UserAuthMappingServiceImpl.java | 14 +++++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 0970a818c..f904a34cd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -101,8 +101,6 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { return Boolean.TRUE; } } else { - // 插入新数据 - saveDO.setSubmitTime(new Date()); decorationMeasureDAO.insertSelective(saveDO, user.getUserId()); // 更新设计状态和测量状态 shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index fe1d7f375..f44136ddf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -581,7 +581,6 @@ public class DecorationServiceImpl implements DecorationService { } else { decorationDesignInfoDO.setCreateTime(new Date()); decorationDesignInfoDO.setUpdateTime(new Date()); - decorationDesignInfoDO.setDesignSubmitTime(new Date()); decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO); //更新装修设计状态 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_901); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index b7feb22be..cca76a2d5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -1,7 +1,10 @@ package com.cool.store.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.cool.store.constants.CommonConstants; +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.EnterpriseUserRoleDao; import com.cool.store.dao.RegionAreaConfigDao; @@ -473,7 +476,16 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { return new ArrayList<>(); } if (CollectionUtils.isNotEmpty(hasRoleUserIdList)) { - return enterpriseUserDAO.findUserInfoByUserIdsAndKeyword(hasRoleUserIdList, request.getKeyword()); + List userDOList = enterpriseUserDAO.findUserInfoByUserIdsAndKeyword(hasRoleUserIdList, request.getKeyword()); + if (CollUtil.isEmpty(userDOList)) { + return new ArrayList<>(); + } + // 报价员只能看到自己 + if (UserRoleEnum.QUOTATION_OFFICE.getDesc().equals(request.getRoleName())) { + LoginUserInfo userInfo = CurrentUserHolder.getUser(); + return userDOList.stream().filter(row -> row.getUserId().equals(userInfo.getUserId())).collect(Collectors.toList()); + } + return userDOList; } return new ArrayList<>(); }