Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -401,14 +401,14 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
                 //填充查询人的姓名和机构
                 agencyExtractFee.setProportional(sysPartner.getProportional());
                 agencyExtractFee.setUserId(sysPartner.getUserId());
-                SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>()
-                        .eq(SysUser::getId, sysPartner.getUserId())
-                        .eq(SysUser::getStatus, 1));
+                SysUser sysUser = sysUserMapper.selectById(sysPartner.getUserId());
+
                 agencyExtractFee.setUserName(sysUser.getName());
                 agencyExtractFee.setDeptId(sysUser.getDeptId());
                 SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
                         .eq(SysDept::getId, sysUser.getDeptId()).eq(SysDept::getDelFlag, 0));
                 agencyExtractFee.setDeptName(sysDept.getName());
+
                 //查询所有推荐的机构负责人核算总保费
                 List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
                         .eq(SysRelationPerson::getSuggestId, sysPartner.getUserId()).eq(SysRelationPerson::getType, 1));