Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotShareInterfaceService.java

@@ -184,16 +184,19 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
        List<IotCompanyAppDO> list = jdbcTemplate.query(sql.toString(),new BeanPropertyRowMapper(IotCompanyAppDO.class));
        ArrayList<IotCompanyAppVO> resultList = new ArrayList<>();
        list.forEach(one->{
        
        for (IotCompanyAppDO iotCompanyAppDO : list){
            IotCompanyAppVO target = new IotCompanyAppVO();
            BeanUtils.copyProperties(one,target);
            IotCompanyDO companyDO = iotCompanyDao.findById(one.getCompanyId());
            BeanUtils.copyProperties(iotCompanyAppDO,target);
            IotCompanyDO companyDO = iotCompanyDao.findById(iotCompanyAppDO.getCompanyId());
            if(companyDO == null){
                continue;
            }
            target.setContactsMobile(companyDO.getContactsMobile());
            target.setContactsName(companyDO.getContactsName());
            target.setId(one.getId());
            target.setId(iotCompanyAppDO.getId());
            resultList.add(target);
        });
        }
        long count =list.size();