update

src/main/java/com/gogirl/application/product/serve/impl/BaseProduceServiceImpl.java

@@ -52,8 +52,8 @@ public class BaseProduceServiceImpl extends ServiceImpl<BaseProduceMapper, BaseP
         Integer sort = baseFeatures != null && baseFeatures.getName().equals("热销款") ? 1 : 2;
         request.setSort(sort);
         request.setSourceFrom(SessionUtils.getSourceFrom());
-
-        request.setDepartmentId(SessionUtils.getCustomerDepartmentId());
+        Integer departmentId = SessionUtils.getDepartmentId();
+        request.setDepartmentId(departmentId);
 
         page = baseProduceMapper.queryProducePage(page, request);
 

src/main/java/com/gogirl/application/product/serve/impl/BaseServeServiceImpl.java

@@ -26,12 +26,13 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
 
     @Override
     public IPage<BaseServe> listServeForPage(IPage<BaseServe> page, BaseServe param) {
-        param.setDepartmentId(SessionUtils.getCustomerDepartmentId());
+        Integer departmentId = SessionUtils.getDepartmentId();
+        param.setDepartmentId(departmentId);
 
         IPage<BaseServe> result = baseServeMapper.listServeForPage(page, param);
         List<Integer> serveIdList = result.getRecords().stream().map(BaseServe::getId).collect(Collectors.toList());
 
-        Integer departmentId = SessionUtils.getCustomerDepartmentId();
+
         List<ServiceStorePrice> serviceStorePriceList = serviceStorePriceMapper.selectList(new LambdaQueryWrapper<ServiceStorePrice>()
                 .eq(ServiceStorePrice::getStoreId, departmentId)
                 .in(ServiceStorePrice::getServiceId, serveIdList));
@@ -52,7 +53,7 @@ public class BaseServeServiceImpl extends ServiceImpl<BaseServeMapper, BaseServe
     @Override
     public BaseServe getAggregate(Integer id) {
         BaseServe baseServe = baseServeMapper.selectById(id);
-        Integer departmentId = SessionUtils.getCustomerDepartmentId();
+        Integer departmentId = SessionUtils.getDepartmentId();
 
         ServiceStorePrice serviceStorePrice = serviceStorePriceMapper.selectOne(new LambdaQueryWrapper<ServiceStorePrice>()
                 .eq(ServiceStorePrice::getStoreId, departmentId)

src/main/java/com/gogirl/infrastructure/common/util/SessionUtils.java

@@ -156,4 +156,15 @@ public class SessionUtils {
 
         }
     }
+
+    public static Integer getDepartmentId() {
+
+        if (StringUtils.isNotEmpty(SessionUtils.getSourceFrom()) && SessionUtils.getSourceFrom().equals(SessionUtils.customer)) {
+            return SessionUtils.getCustomerDepartmentId();
+        }
+        if (StringUtils.isNotEmpty(SessionUtils.getSourceFrom()) && SessionUtils.getSourceFrom().equals(SessionUtils.technician)) {
+            return SessionUtils.getTechnicianToken().getDepartmentId();
+        }
+        return null;
+    }
 }