Răsfoiți Sursa

员工新增以及业务员新增,修改时对附件内容的调整

lipf 5 luni în urmă
părinte
comite
3580938113

+ 8 - 1
commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfoFile.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.util.idgen.IdGenerate;
 import lombok.Data;
 
+import java.io.Serial;
+import java.io.Serializable;
+
 /**
  * @author quchen
  * @date 2025/1/20 16:06
@@ -13,7 +16,11 @@ import lombok.Data;
 
 @Data
 @TableName("sys_user_jzg_info_file")
-public class SysUserJzgInfoFile {
+public class SysUserJzgInfoFile implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2959388859590443115L;
+
     @TableId(value = "id")
     private String id;
 

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

@@ -1073,7 +1073,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfo.setRoleNames(userRole.stream().map(SysRole::getName).collect(Collectors.toList()));
 
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getId()));
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getUserId()));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
         List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(), baseController.getUserSystemCode());
         sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
@@ -1166,7 +1166,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if(sysUploadFiles != null){
                     action.setFileUrl(sysUploadFiles.getDownloadUrl());
                     action.setUserId(String.valueOf(userId));
-                    action.setFileType(sysUploadFiles.getFileType());
+                    //action.setFileType(sysUploadFiles.getFileType());
                     action.setFileName(sysUploadFiles.getFileName());
                     action.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
                 }else{