From 523ef6958b350f585a3e90ae78665017eaf1b927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 14:12:19 +0800
Subject: [PATCH] =?UTF-8?q?debug=E5=90=88=E4=BC=99=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ss/storeStaff/service/impl/StoreStaffServiceImpl.java  | 1 +
 .../storeStaff/service/impl/StoreStaffValidatorImpl.java   | 7 ++++++-
 .../com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java  | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java
index 3c25b625..f8c991ad 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffServiceImpl.java
@@ -171,6 +171,7 @@ public class StoreStaffServiceImpl implements StoreStaffService
             // 后校验
             StoreStaffVO vo = selectStoreStaffByEmployId(employId);
             storeStaffValidator.checkRepeatUser(vo.getStoreId(), vo.getUserId(), vo.getEmployId());
+            storeStaffValidator.checkPoint(vo);
 
             return bind;
         });
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffValidatorImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffValidatorImpl.java
index bb24df15..e2d4a195 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffValidatorImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/storeStaff/service/impl/StoreStaffValidatorImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.ss.storeStaff.service.impl;
 
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.ServiceUtil;
 import com.ruoyi.common.utils.collection.CollectionUtils;
 import com.ruoyi.ss.device.domain.vo.DeviceVO;
@@ -52,7 +53,11 @@ public class StoreStaffValidatorImpl implements StoreStaffValidator {
 
         // 校验设备分成
         for (DeviceVO device : deviceList) {
-            deviceValidator.checkBonus(device);
+            try {
+                deviceValidator.checkBonus(device);
+            } catch (Exception e) {
+                throw new ServiceException("校验分成比例失败：" + e.getMessage() + "，请修改分成比例");
+            }
         }
     }
 
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java
index 138117e3..b91f08fa 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/user/service/impl/UserAssemblerImpl.java
@@ -168,6 +168,7 @@ public class UserAssemblerImpl implements UserAssembler {
 
         StoreStaffQuery query = new StoreStaffQuery();
         query.setUserIds(CollectionUtils.map(list, SmUserVO::getUserId));
+        query.setEnabled(true);
         List<LongCountVO> counts = storeStaffService.selectCountGroupByUserId(query);
 
         for (SmUserVO user : list) {