chore:补充提交

jinpengyong

2023-10-30 49d7ce5a988596d7540083be0e1948bcb66af544

 screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java

@@ -5,6 +5,7 @@
import com.moral.api.entity.Organization;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -28,6 +29,9 @@

    @Autowired
    OrganizationMapper organizationMapper;

    @Autowired
    private DeviceService deviceService;


    @Override
@@ -58,6 +62,13 @@
        }
            wrapper.eq("is_delete",Constants.NOT_DELETE);
        List<Organization> organizations = organizationMapper.selectList(wrapper);
        for (int i=0; i<organizations.size(); i++) {
            List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
            if (ObjectUtils.isEmpty(macs)){
                organizations.remove(i);
                i--;
            }
        }
        return organizations;
    }