修改bug

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -107,10 +107,9 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         if(!authorities.stream().anyMatch(x->x.getSystem().equals(system)) && !username.equals("admin")){
             throw new SystemException("没有权限访问系统");
         }
-        SysUserJzgVo jzgUserInfo;
+        SysUserJzgVo jzgUserInfo = new SysUserJzgVo();
         //获取用户头像
         if(SystemConstants.SYSTEM_PLATFORM.getCode().equals(system)){
-            jzgUserInfo = new SysUserJzgVo();
             SysUser user = sysUserService.getById(byId.getId());
             if(!Objects.isNull(user.getHeadSculpture()) && !user.getHeadSculpture().isEmpty()) {
                 jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", user.getHeadSculpture()));

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

@@ -200,7 +200,7 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
 
     @TableField(value = "is_computer")
     @Schema(description = "是否是计算机专业 1 是 0 否")
-    private String isComputer;
+    private Integer isComputer;
 
     @TableField(value = "speciality")
     @Schema(description = "专业")

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

@@ -49,6 +49,12 @@ public class SysOrganizationController {
         return sysOrganizationService.leftList(sysOrganizationParam);
     }
 
+//    @Operation(summary = "团队获取人员列表",description = "团队获取人员列表")
+//    @PostMapping("getTeamUserList")
+//    public HttpResult getTeamUserList(@Validated @RequestBody SysOrganizationParam sysOrganizationParam){
+//        return sysOrganizationService
+//    }
+
     /**
      * 新增
      * @param organizationAdd
@@ -63,7 +69,7 @@ public class SysOrganizationController {
         }
         SysOrganization sysOrganization = new SysOrganization();
         BeanUtils.copyProperties(organizationAdd, sysOrganization);
-        return HttpResult.ok(sysOrganizationService.save(sysOrganization) ? HttpResult.ok("新增成功") : HttpResult.error("新增失败"));
+        return sysOrganizationService.save(sysOrganization) ? HttpResult.ok("新增成功") : HttpResult.error("新增失败");
     }
 
     /**

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

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysUserJzgInfoFile;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface SysUserJzgInfoFileMapper extends BaseMapper<SysUserJzgInfoFile> {
+
 }

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

@@ -85,6 +85,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         if (StringUtils.isNotEmpty(sysDeptVo.getSystemCode())){
             sysDept.setSystemCode(sysDeptVo.getSystemCode());
         }
+        if (sysDept.getLeaderId().isEmpty()){
+            sysDept.setLeaderId(null);
+        }
         return this.save(sysDept);
     }
 
@@ -216,9 +219,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public boolean setDeptLeader(DeptLeaderVo deptLeaderVo) {
         List<SysDept> depts = this.list(new LambdaQueryWrapper<SysDept>()
                 .in(SysDept::getId,deptLeaderVo.getDeptId()));
-//        if(Objects.isNull(depts)){
-//            throw new SystemException("机构不存在");
-//        }
         SysUser user = userService.getById(deptLeaderVo.getLeaderId());
         if(Objects.isNull(user)){
             throw new SystemException("用户不存在");

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

@@ -451,9 +451,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         if(!Objects.isNull(sysOrganizationUserLink)){
             String organizationId = sysOrganizationUserLink.getOrganizationId();
-            String organizationName = sysOrganizationService.getById(organizationId).getName();
-            sysUserJzgInfo.setOrganizationId(organizationId);
-            sysUserJzgInfo.setOrganizationName(organizationName);
+            SysOrganization sysOrganization = sysOrganizationService.getById(organizationId);
+            if(!Objects.isNull(sysOrganization)){
+                String organizationName = sysOrganizationService.getById(organizationId).getName();
+                sysUserJzgInfo.setOrganizationId(organizationId);
+                sysUserJzgInfo.setOrganizationName(organizationName);
+            }
         }
 
         //给前端返
@@ -463,8 +466,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
         sysUserJzgInfo.setRoleIds(roleIds);
 
+        SysUserJzgInfo byId = sysUserJzgInfoService.getUserByUserId(id);
+
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
-                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId,id));
+                (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserJzgInfoId,byId.getId()));
         sysUserJzgInfo.setFileList(sysUserJzgInfoFile);
         List<SysUserJzgInfoBankCardDto> sysUserJzgInfoBankCardDto = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId());
         sysUserJzgInfo.setBankCardList(sysUserJzgInfoBankCardDto);
@@ -508,7 +513,7 @@ 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) {
+        if (!Objects.isNull(sfz1) && !sfz1.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz1));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz1, userId, sysUploadFiles.getFileName());
@@ -516,7 +521,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (sfz2 != null) {
+        if (!Objects.isNull(sfz2) && !sfz2.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, sfz2));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(sfz2, userId, sysUploadFiles.getFileName());
@@ -524,7 +529,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (qualification != null) {
+        if (!Objects.isNull(qualification) && !qualification.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, qualification));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(qualification, userId, sysUploadFiles.getFileName());
@@ -532,7 +537,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (contract != null) {
+        if (!Objects.isNull(contract) && !contract.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, contract));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(contract, userId, sysUploadFiles.getFileName());
@@ -540,7 +545,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (applicant != null) {
+        if (!Objects.isNull(applicant) && !applicant.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, applicant));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(applicant, userId, sysUploadFiles.getFileName());
@@ -548,7 +553,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (salaryTable != null) {
+        if (!Objects.isNull(salaryTable) && !salaryTable.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, salaryTable));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(salaryTable,userId,sysUploadFiles.getFileName());
@@ -556,7 +561,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
             sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
         }
-        if (leaveTable != null) {
+        if (!Objects.isNull(leaveTable) && !leaveTable.isEmpty()) {
             SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne
                     (new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getId, leaveTable));
             SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile(leaveTable, userId, sysUploadFiles.getFileName());