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

svr/svr-iot/src/main/java/com/yihu/iot/service/device/WlyyDeviceService.java

@@ -71,7 +71,7 @@ public class WlyyDeviceService {
        }
        //数据权限过滤
        List<String> orgList = orgUserService.getUserOrgNameById(userAgent.getUID());
        List<String> orgList = orgUserService.getUserOrgById(userAgent.getUID());
        if(!orgList.contains(userAgent.commonHospital)){
            sql += " and grant_org_code in ("+orgUserService.getUserOrg(orgList)+") ";
        }