Merge remote-tracking branch 'origin/dev_jzb_lipf_v20260427' into dev_jzb_lipf_v20260427

commons/src/main/java/com/jzg/commons/entity/vo/SysUserAccountVo.java

@@ -19,6 +19,9 @@ public class SysUserAccountVo extends BaseModel {
     @Schema(description = "业务员手机号")
     private String mobile;
 
+    @Schema(description = "工号")
+    private String workNumber;
+
     @Schema(description = "业务员类型1.前线人员 2:后线人员 3:合伙人 4:工作室管理员 5:团队 6:个代 7：电销 8 渠道")
     private String attrType;
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -114,7 +114,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             AssertionUtils.isFail(true, "提现申请已完成付款！");
         }
         String userName = baseController.getUserName();
-        if (userName.equals(audit.getReceiveUser())) {
+        if (!userName.equals(audit.getReceiveUser())) {
             AssertionUtils.isFail(true, "已放弃提现申请付款任务！");
         }
 

tenant/organization/src/main/resources/mapper/SysUserAccountMapper.xml

@@ -49,7 +49,7 @@
         SELECT
         sua.id,suji.name,su.mobile, suji.type_attr as attrType, so.name as organizationName,
         sd.name as deptName, sua.sum_amount as sumAmount, sua.sum_amount_paid as sumAmountPaid,
-        sua.sum_amount_unpaid as sumAmountUnpaid
+        sua.sum_amount_unpaid as sumAmountUnpaid, suji.work_number as workNumber
         FROM
         sys_user_account sua
         LEFT JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id