From 19c0efb16d9d5098aa39780ce471f928963142d3 Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Sun, 9 Jun 2024 15:37:25 +0800
Subject: [PATCH] fix

---
 .../clerk/service/impl/PlayClerkUserInfoServiceImpl.java    | 3 +++
 .../play/service/impl/PlayCommodityInfoServiceImpl.java     | 6 +++++-
 .../weichat/entity/PlayClerkUserLoginResponseVo.java        | 5 +++++
 .../weichat/entity/clerk/PlayClerkUserInfoQueryVo.java      | 5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
index b551fd0..d0110ef 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
@@ -198,6 +198,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         if (StrUtil.isNotBlank(vo.getRecommendationState())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getRecommendationState, vo.getRecommendationState());
         }
+        if (StrUtil.isNotBlank(vo.getOnboardingState())) {
+            lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getOnboardingState, vo.getOnboardingState());
+        }
         return this.baseMapper.selectJoinPage(page, PlayClerkUserInfoResultVo.class, lambdaQueryWrapper);
     }
 
diff --git a/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayCommodityInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayCommodityInfoServiceImpl.java
index cefed96..cd72c7e 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayCommodityInfoServiceImpl.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/play/service/impl/PlayCommodityInfoServiceImpl.java
@@ -103,7 +103,11 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl<PlayCommodityInfoM
 
     @Override
     public PlayCommodityInfoVo queryCommodityInfo(String id) {
-        return this.baseMapper.queryCommodityInfo(id);
+        PlayCommodityInfoVo vo = this.baseMapper.queryCommodityInfo(id);
+        if (vo == null) {
+            throw new CustomException("服务项目不存在");
+        }
+        return vo;
     }
 
     /**
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
index 2a917f8..e36c55e 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserLoginResponseVo.java
@@ -125,6 +125,11 @@ public class PlayClerkUserLoginResponseVo {
      */
     private boolean clerkAllowEdit = true;
 
+    /**
+     * 在职状态（1：在职，0：离职）
+     */
+    private String onboardingState = "1";
+
     /**
      * 服务项目
      */
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java
index 08e0460..7612f65 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/clerk/PlayClerkUserInfoQueryVo.java
@@ -54,6 +54,11 @@ public class PlayClerkUserInfoQueryVo extends BasePageEntity {
      */
     private String clerkState = "1";
 
+    /**
+     * 在职状态（1：在职，0：离职）
+     */
+    private String onboardingState = "1";
+
     /**
      * 手机号码
      */