From 783cccc9a9936b7d69a63a51ac9b05ce6dc01056 Mon Sep 17 00:00:00 2001
From: hejiayang <296714699@qq.com>
Date: Mon, 27 Oct 2025 09:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E8=B0=83=E6=95=B4=20=E4=BD=99=E9=A2=9D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CqBaseEmployeePayController.java          | 24 +++++++++++++------
 .../xml/StClientMemberBalanceMapper.xml       | 16 ++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/emp/controller/CqBaseEmployeePayController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/emp/controller/CqBaseEmployeePayController.java
index 389fbe7..47fda22 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/emp/controller/CqBaseEmployeePayController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/emp/controller/CqBaseEmployeePayController.java
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 子员工信息表
@@ -106,14 +107,23 @@ public class CqBaseEmployeePayController extends JeecgController<CqBaseEmployee,
         if(StringUtils.isBlank(sysUserSub.getRealname())){
             return Result.error("用户名不能为空");
         }
-        //家庭用户
-        if(StringUtils.isNotBlank(sysUserSub.getMainUserId()) && StringUtils.isBlank(sysUserSub.getMainUserRelation())){
-            return Result.error("与主账户关系不能为空");
-        }
-        //非正式员工
-        if(StringUtils.isBlank(sysUserSub.getMainUserId()) && StringUtils.isBlank(sysUserSub.getPhone())){
-            return Result.error("手机号不能为空");
+        if(StringUtils.isNotEmpty(sysUserSub.getWorkNo())){
+            //校验工号是否已存在
+            LambdaQueryWrapper<SysUserSub> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SysUserSub::getWorkNo, sysUserSub.getWorkNo());
+            List<SysUserSub> list = sysUserSubService.list(queryWrapper);
+            if(CollectionUtils.isNotEmpty(list)){
+                return Result.error("工号已存在" + list.stream().map(SysUserSub::getRealname).collect(Collectors.toList()));
+            }
         }
+//        //家庭用户
+//        if(StringUtils.isNotBlank(sysUserSub.getMainUserId()) && StringUtils.isBlank(sysUserSub.getMainUserRelation())){
+//            return Result.error("与主账户关系不能为空");
+//        }
+//        //非正式员工
+//        if(StringUtils.isBlank(sysUserSub.getMainUserId()) && StringUtils.isBlank(sysUserSub.getPhone())){
+//            return Result.error("手机号不能为空");
+//        }
         return cqBaseEmployeeService.saveEmpSub(sysUserSub);
     }
 
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberBalanceMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberBalanceMapper.xml
index 7ba24fb..f768f2e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberBalanceMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberBalanceMapper.xml
@@ -92,37 +92,37 @@
     <update id="changeBalanceAndIntegral">
         UPDATE st_client_member_balance
         <if test="status != null">
-            <set>
+            <trim prefix="SET" suffixOverrides=",">
                 <choose>
                     <!--余额补录影响累计余额-->
                     <when test="status == 1">
                         <if test="topUpBalance != null">
                             top_up_balance = top_up_balance + #{topUpBalance,jdbcType=DECIMAL},
-                            top_up_total = top_up_total + #{topUpBalance,jdbcType=DECIMAL}
+                            top_up_total = top_up_total + #{topUpBalance,jdbcType=DECIMAL},
                         </if>
                         <if test="rewardBalance != null">
-                            reward_balance = reward_balance + #{rewardBalance,jdbcType=DECIMAL}
+                            reward_balance = reward_balance + #{rewardBalance,jdbcType=DECIMAL},
                         </if>
 
                         <if test="integralBalance != null">
-                            integral_balance = integral_balance + #{integralBalance,jdbcType=DECIMAL}
+                            integral_balance = integral_balance + #{integralBalance,jdbcType=DECIMAL},
                         </if>
                     </when>
                     <!--扣减不影响累计余额-->
                     <when test="status == 2">
                         <if test="topUpBalance != null">
-                            top_up_balance = top_up_balance - #{topUpBalance,jdbcType=DECIMAL}
+                            top_up_balance = top_up_balance - #{topUpBalance,jdbcType=DECIMAL},
                         </if>
                         <if test="rewardBalance != null">
-                            reward_balance = reward_balance - #{rewardBalance,jdbcType=DECIMAL}
+                            reward_balance = reward_balance - #{rewardBalance,jdbcType=DECIMAL},
                         </if>
 
                         <if test="integralBalance != null">
-                            integral_balance = integral_balance - #{integralBalance,jdbcType=DECIMAL}
+                            integral_balance = integral_balance - #{integralBalance,jdbcType=DECIMAL},
                         </if>
                     </when>
                 </choose>
-            </set>
+            </trim>
         </if>
         WHERE id = #{id,jdbcType=INTEGER}
         <!--扣减需要余额大于扣减数额-->