代码增强

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

@@ -1,6 +1,7 @@
 package com.jzg.organization.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.entity.po.SysUserJzgInfoSalesman;
 import com.jzg.organization.mapper.SysUserJzgInfoSalesmanMapper;
@@ -38,6 +39,7 @@ public class SysUserJzgInfoSalesmanServiceImpl extends ServiceImpl<SysUserJzgInf
         List<SysUserJzgInfoSalesman> sysUserJzgInfoSalesmen = sysUserJzgInfoSalesmanMapper.selectList(null);
         log.debug("查询出[{}]个人员的类型信息", CollectionUtil.size(sysUserJzgInfoSalesmen));
         Map<String, String> resultMap = sysUserJzgInfoSalesmen.stream()
+                .filter(action-> StrUtil.isNotEmpty(action.getSysUserJzgInfoId()))
                 .collect(Collectors.toMap(
                         // 1. Key 映射：先获取 String，再转为 Long
                         SysUserJzgInfoSalesman::getSysUserJzgInfoId,

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

@@ -206,7 +206,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             // 查询成员
             userInfoList = sysUserJzgInfoMapper.queryMember(page, sysUserInfoListVo);
         }else{
-            userInfoList = new Page<>();
+            // 其他场景先使用原来的逻辑
+            userInfoList = sysUserJzgInfoMapper.getUserInfoList(page, sysUserInfoListVo);
         }
         List<SysUserJzgInfoDto> records = userInfoList.getRecords();
         if(CollectionUtil.isNotEmpty(records)){