业务员管理修改

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -0,0 +1,29 @@
+package com.jzg.commons.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author quchen
+ * @date 2025/1/22 14:18
+ */
+
+@Data
+public class SysUserJzgInfoBankCardDto implements Serializable {
+    private String id;
+
+    private String userInfoId;
+
+    private String name;
+
+    private String bankName;
+
+    private String bankAddress;
+
+    private String bankCardNumber;
+
+    private String auditStatus;
+
+    private String cardFile;
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoDto.java

@@ -32,4 +32,7 @@ public class SysUserJzgInfoDto {
     @Schema(description = "角色名称")
     public String roleName;
 
+    public String organizationId;
+    public String organizationName;
+
 }

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -18,7 +20,7 @@ import java.util.List;
 @Data
 @TableName("sys_user_jzg_info")
 @Schema(description = "业务员信息表")
-public class SysUserJzgInfo extends BaseModel {
+public class SysUserJzgInfo extends BaseModel implements Serializable {
     @TableId(value = "id")
     @Schema(description = "主键")
     private String id;
@@ -257,6 +259,10 @@ public class SysUserJzgInfo extends BaseModel {
     @Schema(description = "附件列表")
     private List<SysUserJzgInfoFile> fileList;
 
+    @TableField(exist = false)
+    @Schema(description = "银行卡列表")
+    private List<SysUserJzgInfoBankCardDto> bankCardList;
+
     @TableField(exist = false)
     @Schema(description = "部门名称")
     private String deptName;
@@ -269,6 +275,21 @@ public class SysUserJzgInfo extends BaseModel {
     @Schema(description = "手机号")
     private String mobile;
 
+    @TableField(exist = false)
+    @Schema(description = "推荐人名字")
+    private String referrerName;
+
+    @TableField(exist = false)
+    @Schema(description = "管理人名字")
+    private String leaderName;
+
+    @TableField(exist = false)
+    @Schema(description = "团队、渠道、电销组ID")
+    private String organizationId;
+
+    @TableField(exist = false)
+    @Schema(description = "团队、渠道、电销组名字")
+    private String organizationName;
     @TableField(exist = false)
     @Schema(description = "角色名称集合")
     private List<String> roleIds;

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

@@ -47,6 +47,11 @@ public class SysUserJzgInfoBankCard {
     @Schema(description = "备注")
     private String remark;
 
+    @TableField(value = "file_id")
+    @Schema(description = "附件id")
+    private String fileId;
+
+
     public SysUserJzgInfoBankCard(){
 
     }

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

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.util.idgen.IdGenerate;
 import lombok.Data;
 
 /**
@@ -13,7 +14,10 @@ import lombok.Data;
 @Data
 @TableName("sys_user_jzg_info_file")
 public class SysUserJzgInfoFile {
-    @TableId(value = "file_id")
+    @TableId(value = "id")
+    private String id;
+
+    @TableField(value = "file_id")
     private String fileId;
 
     @TableField(value = "user_jzg_info_id")
@@ -28,4 +32,11 @@ public class SysUserJzgInfoFile {
     @TableField(value = "file_type")
     private String fileType;
 
+    public SysUserJzgInfoFile(String fileId, String userJzgInfoId, String fileName) {
+        this.id = IdGenerate.nextId();
+        this.fileId = fileId;
+        this.userJzgInfoId = userJzgInfoId;
+        this.fileName = fileName;
+    }
+
 }

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

@@ -47,7 +47,7 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "是否启用 1 启用 0禁用")
     private Integer isEnable;
 
-    @Schema(description = "部门id")
+    @Schema(description = "机构id")
     private String deptId;
 
     @Schema(description = "姓名")

tenant/openfeign/pom.xml

@@ -21,12 +21,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>8.5.7</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
     <build>

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoBankCardMapper.java

@@ -1,10 +1,14 @@
 package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SysUserJzgInfoBankCardMapper extends BaseMapper<SysUserJzgInfoBankCard> {
+    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId);
 
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/SysUserJzgInfoMapper.java

@@ -3,6 +3,7 @@ package com.jzg.organization.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.vo.SysUserInfoListVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,6 +15,6 @@ import java.util.List;
 public interface SysUserJzgInfoMapper extends BaseMapper<SysUserJzgInfo> {
     List<SysUserJzgInfo> getUserInfoByIdentity(@Param("identity") String identity, @Param("userId") String userId);
 
-    Page<SysUserJzgInfo> getUserInfoList(Page page, @Param("sysUserInfoListVo") SysUserInfoListVo sysUserInfoListVo);
+    Page<SysUserJzgInfoDto> getUserInfoList(Page page, @Param("sysUserInfoListVo") SysUserInfoListVo sysUserInfoListVo);
 
 }

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

@@ -2,7 +2,13 @@ package com.jzg.organization.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 
+import java.util.List;
+
 public interface SysUserJzgInfoBankCardService extends IService<SysUserJzgInfoBankCard> {
+
+    List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.po.SysUserJzgInfo;
 import com.jzg.commons.entity.vo.*;
@@ -47,7 +48,7 @@ public interface SysUserService extends IService<SysUser> {
 
     HttpResult getUserInfoById(String id);
 
-    Page<SysUserJzgInfo> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo);
+    Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo);
 
     /**
      * 获取成员转移资源信息

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

@@ -1,15 +1,26 @@
 package com.jzg.organization.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper;
 import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author quchen
  * @date 2025/1/18 9:48
  */
 @Service
 public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInfoBankCardMapper, SysUserJzgInfoBankCard> implements SysUserJzgInfoBankCardService {
+    @Resource
+    private SysUserJzgInfoBankCardMapper sysUserJzgInfoBankCardMapper;
+
+    @Override
+    public List<SysUserJzgInfoBankCardDto> getBankCardByUserId(String userInfoId) {
+        return sysUserJzgInfoBankCardMapper.getBankCardByUserId(userInfoId);
+    }
 }

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

@@ -25,7 +25,7 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
     @Override
     public SysUserJzgInfo getUserByUserId(String userId) {
         return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getUserId, userId));
+                .eq(SysUserJzgInfo::getId, userId));
     }
 
 

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

@@ -7,6 +7,8 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.PageRequest;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
+import com.jzg.commons.entity.dto.SysUserJzgInfoDto;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
@@ -20,6 +22,7 @@ import com.jzg.organization.service.*;
 import com.jzg.organization.service.*;
 import com.jzg.organization.state.UserState;
 import com.jzg.organization.state.listener.UserStateListener;
+import io.micrometer.core.instrument.Meter;
 import jakarta.annotation.Resource;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +68,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     private SysOrganizationUserLinkService sysOrganizationUserLinkService;
 
+    @Resource
+    private SysOrganizationService sysOrganizationService;
+
     @Autowired
     private UserStateListener userStateListener;
 
@@ -122,7 +128,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public Page<SysUserJzgInfo> getUserInfoList(Page page,SysUserInfoListVo sysUserInfoListVo) {
+    public Page<SysUserJzgInfoDto> getUserInfoList(Page page, SysUserInfoListVo sysUserInfoListVo) {
         return sysUserJzgInfoMapper.getUserInfoList(page,sysUserInfoListVo);
     }
 
@@ -219,6 +225,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoId = sysUserJzgInfo.getId();
             sysUserId = sysUser1.getId();
             sysUserJzgInfoService.save(sysUserJzgInfo);
+            saveOrganization(sysUserVo.getOrganizationId(), sysUserJzgInfo.getId());
+            saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(),sysUserJzgInfo.getId());
         }
 
         //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
@@ -293,24 +301,21 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (sysUserJzgInfo == null) {
             throw new SystemException("该业务员不存在");
         }
-        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
-        BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
-        sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
-        sysUserJzgInfoBankCard.setAuditStatus(0);
-        sysUserJzgInfoBankCard.setIsDefault(0);
-        sysUserJzgInfoBankCard.setRemark("");
-        sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+        String fileId = IdGenerate.nextId();
         if (sysUserJzgInfoBankCardVo.getAttachment() != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sysUserJzgInfoBankCardVo.getAttachment()));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(sysUserJzgInfoBankCardVo.getAttachment());
-            sysUserJzgInfoFile.setUserJzgInfoId(sysUserJzgInfoBankCardVo.getUserJzgInfoId());
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sysUserJzgInfoBankCardVo.getAttachment(),sysUserJzgInfoBankCardVo.getUserJzgInfoId(),sysUploadFiles.getFileName());
+            sysUserJzgInfoFile.setId(fileId);
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFile.setFileType("bankcard");
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
+        SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
+        BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
+        sysUserJzgInfoBankCard.setFileId(fileId);
+        sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+
         return HttpResult.ok("添加银行卡成功");
     }
 
@@ -325,6 +330,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 //            throw new SystemException("该业务员已被禁用");
 //        }
         BeanUtils.copyProperties(sysUserVo, sysUserJzgInfo);
+        saveFile(sysUserVo.getSfz1(), sysUserVo.getSfz2(), sysUserVo.getQualification(), sysUserVo.getContract(), sysUserVo.getApplicant(), sysUserVo.getSalaryTable(), sysUserVo.getLeaveTable(), sysUserJzgInfo.getId());
         sysUserJzgInfoService.updateById(sysUserJzgInfo);
 
         //用户角色处理
@@ -375,6 +381,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             sysUserJzgInfo.setRegion(region.substring(0, region.length() - 1));
         }
+        if (!Objects.isNull(sysUserJzgInfo.getLeaderId())) {
+            String leaderName = sysUserJzgInfoService.getById(sysUserJzgInfo.getLeaderId()).getName();
+            sysUserJzgInfo.setLeaderName(leaderName);
+        }
+        if (!Objects.isNull(sysUserJzgInfo.getReferrerId())) {
+            String referrerName = sysUserJzgInfoService.getById(sysUserJzgInfo.getReferrerId()).getName();
+            sysUserJzgInfo.setReferrerName(referrerName);
+        }
+        String organizationId = sysOrganizationUserLinkService.getOne
+                (new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getUserId,sysUserJzgInfo.getId())).getOrganizationId();
+        String organizationName = sysOrganizationService.getById(organizationId).getName();
+        sysUserJzgInfo.setOrganizationId(organizationId);
+        sysUserJzgInfo.setOrganizationName(organizationName);
         //给前端返
         sysUserJzgInfo.setPassword("******");
         //角色
@@ -385,6 +404,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
                 (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId,id));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
+        List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId());
+        sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
         return HttpResult.ok(sysUserJzgInfo);
     }
 
@@ -422,79 +443,59 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     public void saveFile(String sfz1, String sfz2, String qualification, String contract, String applicant, String salaryTable, String leaveTable,String userId) {
         if (sfz1 != null) {
-            SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne(new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz1));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(sfz1);
+            SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
+                    (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz1));
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz1, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("sfz1");
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (sfz2 != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz2));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(sfz2);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz2, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("sfz2");
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (qualification != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, qualification));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(qualification);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(qualification, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("qualification");
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (contract != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, contract));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(contract);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(contract, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("contract");
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (applicant != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, applicant));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(applicant);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(applicant, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("applicant");
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (salaryTable != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, salaryTable));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(salaryTable);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(salaryTable,userId,sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("salary");
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (leaveTable != null) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, leaveTable));
-            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
-            sysUserJzgInfoFile.setFileId(leaveTable);
+            SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(leaveTable, userId, sysUploadFiles.getFileName());
             sysUserJzgInfoFile.setFileType("leave");
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
-            sysUserJzgInfoFile.setUserJzgInfoId(userId);
-            sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
     }

tenant/organization/src/main/resources/application.yml

@@ -41,6 +41,9 @@ tenant:
     - sys_user_jzg_info_bank_card
     - sys_user_role
     - sys_user_jzg_info_file
+    - sys_organization
+    - sys_organization_user_link
+    - sys_upload_files
   ignoreLoginNames:
 
 data-scope:

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

@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.organization.mapper.SysUserJzgInfoBankCardMapper">
+    <resultMap id="BaseResultMap" type="com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto">
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="userInfoId" jdbcType="VARCHAR" property="userInfoId"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="bankName" jdbcType="VARCHAR" property="bankName"/>
+        <result column="bankAddress" jdbcType="VARCHAR" property="bankAddress"/>
+        <result column="bankCardNumber" jdbcType="VARCHAR" property="bankCardNumber"/>
+        <result column="auditStatus" jdbcType="VARCHAR" property="auditStatus"/>
+        <result column="cardFile" jdbcType="VARCHAR" property="cardFile"/>
+    </resultMap>
+
+    <select id="getBankCardByUserId" resultMap="BaseResultMap">
+        select
+            sujibc.id as id,
+            suji.name as name,
+            suji.id as userInfoId,
+            sujibc.bank_name as bankName,
+            sujibc.bank_address as bankAddress,
+            sujibc.bank_card_number as bankCardNumber,
+            sujibc.audit_status as auditStatus,
+            sujif.file_url as cardFile
+        from
+            sys_user_jzg_info_bank_card sujibc
+        left join sys_user_jzg_info suji on suji.id = sujibc.user_jzg_info_id
+        left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id
+        where
+            1=1
+            and suji.id = #{userInfoId}
+    </select>
 </mapper>

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

@@ -18,6 +18,8 @@
         <result column="referrer_id" jdbcType="VARCHAR" property="referrerId"/>
         <result column="referrer_name" jdbcType="VARCHAR" property="referrerName"/>
         <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
+        <result column="organization_id" jdbcType="VARCHAR" property="organizationId"/>
+        <result column="organization_name" jdbcType="VARCHAR" property="organizationName"/>
     </resultMap>
 
     <select id="getUserInfoByIdentity" resultType="com.jzg.commons.entity.po.SysUserJzgInfo">
@@ -51,13 +53,17 @@
         su.username as leader_name,
         suji.referrer_id,
         su.username as referrer_name,
-        GROUP_CONCAT(sr.name) as role_name
+        GROUP_CONCAT(sr.name) as role_name,
+        soul.organization_id as organization_id,
+        so.name as organization_name
         from
         sys_user_jzg_info suji
         left join sys_user su on su.id = suji.user_id
         left join sys_dept sd on sd.id = suji.dept_id
         left join sys_user_role sur on sur.user_id = su.id
         left join sys_role sr on sr.id = sur.role_id
+        left join sys_organization_user_link soul on soul.user_id = suji.id
+        left join sys_organization so on so.id = soul.organization_id
         where
         1=1
         and suji.is_delete = 0
@@ -86,7 +92,7 @@
             or  su.mobile = #{sysUserInfoListVo.salesman}
             or  suji.id = #{sysUserInfoListVo.salesman})
         </if>
-        group by    suji.id
+        group by suji.id, soul.organization_id, so.name
         order by suji.create_time desc
     </select>
 </mapper>