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 queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysUserSub::getWorkNo, sysUserSub.getWorkNo()); + List 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 st_client_member_balance - + 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}, - reward_balance = reward_balance + #{rewardBalance,jdbcType=DECIMAL} + reward_balance = reward_balance + #{rewardBalance,jdbcType=DECIMAL}, - integral_balance = integral_balance + #{integralBalance,jdbcType=DECIMAL} + integral_balance = integral_balance + #{integralBalance,jdbcType=DECIMAL}, - top_up_balance = top_up_balance - #{topUpBalance,jdbcType=DECIMAL} + top_up_balance = top_up_balance - #{topUpBalance,jdbcType=DECIMAL}, - reward_balance = reward_balance - #{rewardBalance,jdbcType=DECIMAL} + reward_balance = reward_balance - #{rewardBalance,jdbcType=DECIMAL}, - integral_balance = integral_balance - #{integralBalance,jdbcType=DECIMAL} + integral_balance = integral_balance - #{integralBalance,jdbcType=DECIMAL}, - + WHERE id = #{id,jdbcType=INTEGER}