app提现申请时sys_amount_auditing表新增manager_userId和manager_userName字段

commons/src/main/java/com/jzg/commons/entity/po/SysAmountAuditing.java

@@ -100,6 +100,11 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "系统code")
     private String systemCode;
 
+    @Schema(description = "管理人的用戶ID")
+    private String managerUserId;
+    @Schema(description = "管理人的姓名")
+    private String managerUserName;
+
     /**
      * 构造提现
      * @param applyWithdrawParam

commons/src/main/java/com/jzg/commons/entity/userinfo/ManagerUserInfo.java

@@ -0,0 +1,32 @@
+package com.jzg.commons.entity.userinfo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 管理人信息
+ *
+ * @author lipf
+ * @date 2026/8/27 11:19
+ */
+@Data
+public class ManagerUserInfo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 7522377148687127356L;
+
+
+    @Schema(description = "管理人在sys_user表中的序号")
+    private String managerUserId;
+
+//    @Schema(description = "管理人在sys_user表的userName字段")
+//    private String managerUserName;
+
+    @Schema(description = "管理人在sys_user_jzg_info表的序号")
+    private String managerJzgInfoId;
+
+    @Schema(description = "管理人在sys_user_jzg_info表的Name字段")
+    private String managerName;
+}

tenant/organization/src/main/java/com/jzg/organization/service/SysUserJzgInfoService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.PartnerReviewParam;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.PartnerRecommenderVo;
 
 import java.util.List;
@@ -12,6 +13,16 @@ import java.util.Map;
 
 public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
 
+    /**
+     * 根据 sys_user_jzg_info 表的序号查询改用户管理人的信息
+     *
+     * @param jzgInfoId sys_user_jzg_info 表的序号
+     * @return ManagerUserInfo
+     * @author lipf
+     * @date 2026/8/27 11:29
+     */
+    ManagerUserInfo queryManagerInfoByJzgInfo(String jzgInfoId);
+
     /**
      * 查询有效的业务员信息
      *

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

@@ -18,6 +18,7 @@ import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 import com.jzg.commons.entity.vo.IncomeAndExpenseList;
 import com.jzg.commons.exception.SystemException;
@@ -86,6 +87,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
 
     @Override
     public Page<AmountAuditVo> queryPage(AmountAuditParam param) {
+        log.info("应付账款-提现申请： param=[{}]", JSONUtil.toJsonStr(param));
         Page<AmountAuditVo> page = baseMapper.queryPage(param.getPage(), param);
         List<AmountAuditVo> records = page.getRecords();
         if(CollUtil.isNotEmpty(records)){
@@ -452,7 +454,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         }
         SysUserJzgInfoBankCardDto sysUserJzgInfoBankCardDto = bankCardByUserId.stream().filter(x -> x.getId().equals(applyWithdrawParam.getBankCardId())).findFirst().get();
         // 构造提现对象
-        SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());
+        SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());;
+        // 查询业务员的管理员信息
+        ManagerUserInfo managerUserInfo = sysUserJzgInfoService.queryManagerInfoByJzgInfo(sysUserJzgInfo.getId());
+        if(managerUserInfo != null){
+            sysAmountAuditing.setManagerUserId(managerUserInfo.getManagerUserId());
+            sysAmountAuditing.setManagerUserName(managerUserInfo.getManagerName());
+        }
         baseMapper.insert(sysAmountAuditing);
         return HttpResult.ok("提现申请完成");
     }

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

@@ -11,6 +11,7 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.entity.account.po.SysUserAccountChangeLog;
 import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.*;
+import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.util.BigDecimalUtil;
 import com.jzg.organization.client.QuoteClient;

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

@@ -9,6 +9,7 @@ import com.jzg.commons.entity.dto.PartnerReviewParam;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.user.vo.UserInfoWithPhone;
+import com.jzg.commons.entity.userinfo.ManagerUserInfo;
 import com.jzg.commons.entity.vo.PartnerRecommenderVo;
 import com.jzg.organization.mapper.SysUserJzgInfoMapper;
 import com.jzg.organization.mapper.SysUserMapper;
@@ -37,6 +38,37 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    /**
+     * 根据 sys_user_jzg_info 表的序号查询改用户管理人的信息
+     *
+     * @param jzgInfoId sys_user_jzg_info 表的序号， 业务员的id
+     * @return ManagerUserInfo
+     * @author lipf
+     * @date 2026/8/27 11:29
+     */
+    @Override
+    public ManagerUserInfo queryManagerInfoByJzgInfo(String jzgInfoId) {
+        log.info("根据 sys_user_jzg_info 表的序号查询改用户管理人的信息. jzgInfoId=[{}]", jzgInfoId);
+        if(jzgInfoId == null){
+            return null;
+        }
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectById(jzgInfoId);
+        if(sysUserJzgInfo == null || StrUtil.isEmpty(sysUserJzgInfo.getLeaderId())){
+            return null;
+        }
+        // 管理人在sys_user_jzg_info 表的序号
+        String leaderId = sysUserJzgInfo.getLeaderId();
+        SysUserJzgInfo managerUserJzgInfo = sysUserJzgInfoMapper.selectById(leaderId);
+        if(managerUserJzgInfo == null){
+            log.info("根据管理人id=[{}]查询sys_user_jzg_info 表中数据为空",leaderId);
+            return null;
+        }
+        ManagerUserInfo  managerUserInfo = new ManagerUserInfo();
+        managerUserInfo.setManagerJzgInfoId(managerUserJzgInfo.getId());
+        managerUserInfo.setManagerName(managerUserJzgInfo.getName());
+        managerUserInfo.setManagerUserId(managerUserJzgInfo.getUserId());
+        return managerUserInfo;
+    }
 
     /**
      * 查询有效的业务员信息

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

@@ -843,6 +843,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult<Boolean> batchLeader(BatchLeaderVo batchLeaderVo) {
+        log.info("设置管理人：batchLeaderVo=[{}]", JSONUtil.toJsonStr(batchLeaderVo));
         if (batchLeaderVo.getGetAll() == 1) {
             List<SysUserJzgInfo> sysUserJzgInfoList = sysUserJzgInfoService.list();
             for (SysUserJzgInfo sysUserJzgInfo : sysUserJzgInfoList) {