Merge branch 'dev' of suhaiwen/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -144,10 +144,19 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        List<Map<String,Object>> countList = jdbcTempalte.queryForList(sqlCount.toString());
        long count = Long.valueOf(countList.get(0).get("count").toString());
        //DO转VO
        List<IotCompanyVO> iotCompanyVOList = convertToModelVOs(list,new ArrayList<>(list.size()));
//        //DO转VO
//        List<IotCompanyVO> iotCompanyVOList = convertToModelVOs(list,new ArrayList<>(list.size()));
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Company.message_success_find_functions,iotCompanyVOList, page, size,count);
        ArrayList<IotCompanyVO> listVO = new ArrayList<>();
        list.forEach(one->{
            IotCompanyVO companyVO = convertToModelVO(one);
            listVO.add(companyVO);
        });
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Company.message_success_find_functions,listVO, page, size,count);
    }
    /**
@@ -632,7 +641,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setEhrUserId(userAgent.getUID());
        iotCompanyDao.save(companyDO);
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, convertToModelVO(iotCompany));
        return MixEnvelop.getSuccess("注册成功", convertToModelVO(iotCompany));
    }