修改

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

@@ -11,11 +11,11 @@ public class SysOrganizationSetPerson {
 
     @Schema(description = "团队、渠道、电销组id")
     @NotNull(message = "团队、渠道、电销组id不能为空")
-    private Long id;
+    private String id;
 
     @Schema(description = "管理人id")
     @NotNull(message = "管理人不能为空")
-    private Long managerId;
+    private String managerId;
 
 
 }

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

@@ -15,15 +15,15 @@ import lombok.Data;
 public class SysOrganization extends BaseModel {
 
     @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
     private String systemCode;
 
     private String name;
 
-    private Long deptId;
+    private String deptId;
 
-    private Long managerId;
+    private String managerId;
 
     private String describeInformation;
 

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

@@ -6,16 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
+
 
 @Schema(description = "团队、渠道、电销组关联用户表")
 @Data
-public class SysOrganizationUserLink {
+public class SysOrganizationUserLink implements Serializable {
 
     @TableId(type = IdType.ASSIGN_ID)
-    private Long id;
+    private String id;
 
-    private Long userId;
+    private String userId;
 
-    private Long organizationId;
+    private String organizationId;
 
 }

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

@@ -4,21 +4,23 @@ package com.jzg.commons.entity.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 @Schema(description = "左侧组织机构VO")
-public class LeftSysOrganizationVo {
+public class LeftSysOrganizationVo implements Serializable {
 
     @Schema(description = "id")
-    private Long id;
+    private String id;
 
     @Schema(description = "系统code")
-    private Long systemCode;
+    private String systemCode;
 
     @Schema(description = "名称")
-    private Long name;
+    private String name;
 
     @Schema(description = "机构id")
-    private Long deptId;
+    private String deptId;
 
     @Schema(description = "机构id")
     private String deptName;

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

@@ -23,4 +23,7 @@ public class SysUserJzgInfoBankCardVo {
     @Schema(description = "开户行地址")
     private String bankAddress;
 
+    @Schema(description = "附件")
+    private String attachment;
+
 }

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

@@ -166,6 +166,9 @@ public class SysUserVo extends PageRequest {
     @Schema(description = "离职表")
     private String leaveTable;
 
+    @Schema(description = "团队、渠道、电销id")
+    private String organizationId;
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor

gateway/src/main/resources/application.yml

@@ -21,6 +21,6 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**
 
 

tenant/organization/src/main/java/com/jzg/organization/controller/SysOrganizationController.java

@@ -88,7 +88,7 @@ public class SysOrganizationController {
      */
     @Operation(summary = "团队、渠道、电销组 通过ID删除", description = "通过ID删除")
     @GetMapping("deleteById")
-    public HttpResult deleteById(@RequestParam("id") Long id){
+    public HttpResult deleteById(@RequestParam("id") String id){
         return sysOrganizationService.deleteById(id);
     }
 

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

@@ -12,7 +12,7 @@ public interface SysOrganizationService extends IService<SysOrganization> {
 
     HttpResult queryPageList(SysOrganizationParam sysOrganizationParam);
 
-    HttpResult deleteById(Long id);
+    HttpResult deleteById(String id);
 
     boolean nameExists(SysOrganizationAdd organizationAdd);
 

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

@@ -6,7 +6,7 @@ import com.jzg.commons.entity.dto.DeleteAssociatedUsers;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 
 public interface SysOrganizationUserLinkService extends IService<SysOrganizationUserLink>{
-    boolean selectByOrgId(Long id);
+    boolean selectByOrgId(String id);
 
     boolean deleteAssociatedUsers(DeleteAssociatedUsers deleteAssociatedUsers);
 

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

@@ -68,7 +68,7 @@ public class SysOrganizationServiceImpl extends ServiceImpl<SysOrganizationMappe
 
 
     @Override
-    public HttpResult deleteById(Long id) {
+    public HttpResult deleteById(String id) {
         boolean isExist = sysOrganizationUserLinkService.selectByOrgId(id);
         if (isExist){
             return HttpResult.error("该机构下还有用户，请先删除用户");

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

@@ -22,7 +22,7 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
     private SysOrganizationUserLinkServiceMapper sysOrganizationUserLinkServiceMapper;
 
     @Override
-    public boolean selectByOrgId(Long id) {
+    public boolean selectByOrgId(String id) {
         SysOrganizationUserLink sysOrganizationUserLink = new SysOrganizationUserLink();
         sysOrganizationUserLink.setOrganizationId(id);
         List<SysOrganizationUserLink> sysOrganizationUserLinks = sysOrganizationUserLinkServiceMapper.selectList(getWrapper(sysOrganizationUserLink));

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

@@ -57,6 +57,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private StateMachine<UserState.UserStateEnum, UserState.UserStateEvent> stateMachine;
 
+    @Resource
+    private SysOrganizationUserLinkService sysOrganizationUserLinkService;
+
     private String getCurrentAreaCode(String province,String city,String area){
         String userWorkNumber = "";
         if (!area.isEmpty()) {
@@ -163,8 +166,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfo.setIsEnable(0);
             sysUserJzgInfo.setIsDelete(0);
             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());
-
             //如果表单输入的银行卡号和银行名不为空，则保存银行卡信息
             if (sysUserVo.getBankCardId() != null && sysUserVo.getBankName() != null) {
                 SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
@@ -275,6 +278,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfoBankCard.setIsDefault(0);
         sysUserJzgInfoBankCard.setRemark("");
         sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
+        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.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
+            sysUserJzgInfoFile.setFileType("bankcard");
+            sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
+        }
         return HttpResult.ok("添加银行卡成功");
     }
 
@@ -353,6 +367,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
+    public void saveOrganization(String organizationId, String jzgUserInfoId) {
+        SysOrganizationUserLink sysOrganizationUserLink = new SysOrganizationUserLink();
+        sysOrganizationUserLink.setId(IdGenerate.nextId());
+        sysOrganizationUserLink.setOrganizationId(organizationId);
+        sysOrganizationUserLink.setUserId(jzgUserInfoId);
+        sysOrganizationUserLinkService.save(sysOrganizationUserLink);
+    }
+
     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));
@@ -361,6 +383,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileType("sfz1");
             sysUserJzgInfoFile.setUserJzgInfoId(userId);
             sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
+            sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
         if (sfz2 != null) {