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

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

@@ -72,8 +72,8 @@ public class WlyyDeviceService {
        //数据权限过滤
        List<String> orgList = orgUserService.getUserOrgNameById(userAgent.getUID());
        if(!orgList.contains(userAgent.commonHospitalName)){
            sql += " and org_name in ("+orgUserService.getUserOrg(orgList)+") ";
        if(!orgList.contains(userAgent.commonHospital)){
            sql += " and grant_org_code in ("+orgUserService.getUserOrg(orgList)+") ";
        }
        sql += " order by id desc ";
@@ -150,7 +150,7 @@ public class WlyyDeviceService {
        //数据权限过滤
        List<String> orgList = orgUserService.getUserOrgById(userAgent.getUID());
        if(!orgList.contains(userAgent.commonHospital)){
            sql += " and i.hospital in ("+orgUserService.getUserOrg(orgList)+") ";
            filter.append(" and i.hospital in ("+orgUserService.getUserOrg(orgList)+") ");
        }
        String f = filter.toString();