exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -116,12 +116,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         //查询根据组织ID查询人员信息
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         queryWrapper.eq(SmileUser::getOrgId, orgId);
-        List<SmileUserVoOrg> smileUserVos = smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> {
+        return smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> {
             SmileUserVoOrg smileUserVo = new SmileUserVoOrg();
             BeanUtils.copyProperties(smileUser, smileUserVo);
             return smileUserVo;
         }).collect(Collectors.toList());
-        return smileUserVos;
     }
 
     @Override
@@ -171,7 +170,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             if (smileOrganization != null && !StringUtils.isEmpty(smileUserCheckVo.getUid())) {
                 if (smileUserCheckVo.getType().equals(1)) {
                     //总代
-                    if (smileOrganization != null && StringUtils.isEmpty(smileOrganization.getAgentId())) {
+                    if (StringUtils.isEmpty(smileOrganization.getAgentId())) {
                         //没有总代  修改代理
                         smileOrganization.setUpdatedDate(LocalDateTime.now());
                         smileOrganization.setAgentId(smileUserCheckVo.getUid());