修改人员的bug

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

@@ -406,7 +406,10 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
                 log.info("租户登录异常：用户不存在。 userId=[{}]",userId);
                 throw new SystemException("业务员不存在");
             }
-            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfos.get(0);
+            SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfos.stream()
+                    .filter(x -> Objects.equals(x.getSystemCode(), system))
+                    .findFirst()
+                    .orElse(null);
             // 租户系统才会校验这个， 后台管理系统，没有租户的概念
             if(this.isTenantLogin(system)){
                 if (sysUserJzgInfo.cannotLogin()) {

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

@@ -147,6 +147,9 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "邮政编码")
     private String postalCode;
 
+    @TableField(value = "email")
+    private String email;
+
     @TableField(value = "blood_type")
     @Schema(description = "血型")
     private String bloodType;

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

@@ -20,6 +20,8 @@ public interface SysUserJzgInfoService extends IService<SysUserJzgInfo> {
      */
     List<SysUserJzgInfo> getUserInfoByIdentity(String identity,String userId);
 
+    SysUserJzgInfo getByUserIdOrId(String id);
+
     /**
      * 通过userId查询用户信息
      * @param userId 用户序号

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

@@ -28,6 +28,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -322,7 +323,9 @@ public class SysDistributionSettingServiceImpl extends ServiceImpl<SysDistributi
                 pendingAmount = pendingAmount.add(fee);
             }
         }
-        resultVo.setAuditApprovalTime(sysDistributionAudit.getAuditApprovalTime() != null ? sysDistributionAudit.getAuditApprovalTime() : null);
+        if(Objects.nonNull(sysDistributionAudit)) {
+            resultVo.setAuditApprovalTime(sysDistributionAudit.getAuditApprovalTime() != null ? sysDistributionAudit.getAuditApprovalTime() : null);
+        }
         resultVo.setTotalAmount(totalFee); // 累计佣金
         resultVo.setPendingAmount(pendingAmount); // 待结算佣金
         resultVo.setTotalPremium(totalPremium); // 累计保费

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

@@ -38,6 +38,14 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
         return baseMapper.getUserInfoByIdentity(identity, userId);
     }
 
+    @Override
+    public SysUserJzgInfo getByUserIdOrId(String id) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
+                .eq(SysUserJzgInfo::getUserId,id)
+                .or()
+                .eq(SysUserJzgInfo::getId,id));
+    }
+
     @Override
     public SysUserJzgInfo getUserByUserId(String userId) {
         return baseMapper.getUserJzgInfoByUserId(userId);

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

@@ -218,7 +218,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             log.info("查看成员下的业务员信息：成员的序号：jzgInfoId=[{}]", jzgInfoId);
             // modify by lipf 查询成员下业务员的时候，不进行分页
-            page.setSize(Long.MAX_VALUE);
+//            page.setSize(Long.MAX_VALUE);
             userInfoList = sysUserJzgInfoMapper.queryYwy(page, sysUserInfoListVo, systemCode, jzgInfoId
             );
         }else if("1".equals(sysUserInfoListVo.getIsMember())){
@@ -1041,7 +1041,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public HttpResult<SysUserJzgInfo> getUserInfoByUserId(String id) {
-        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getByUserIdOrId(id);
         log.info("根据id=[{}]查询用户信息sysUserJzgInfo=[{}]",id, JSONUtil.toJsonStr(sysUserJzgInfo));
         if (sysUserJzgInfo == null) {
             throw new SystemException("该用户不存在");