设备权限

src/main/java/com/zoniot/ccrc/service/impl/DeviceServiceImpl.java

@@ -65,7 +65,7 @@ public class DeviceServiceImpl implements DeviceService{
         LoginUser loginUser = UserUtil.getCurrentUser();
         Integer userId = null;
         List<Integer> communityIds = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
         if (orgId != null) communityIds = organizationMapper.findCommunityIds(orgId);
 
 
@@ -80,7 +80,7 @@ public class DeviceServiceImpl implements DeviceService{
         LoginUser loginUser = UserUtil.getCurrentUser();
         Integer userId = null;
         List<Integer> communityIds = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
         if (orgId != null) communityIds = organizationMapper.findCommunityIds(orgId);
         List<DeviceDto> list = deviceMapper.getList(loginUser.getSiteId(),userId,sysId,deviceTypeId,orgId,province,city,region,communityId,buildingId,deviceNo,clientName,locDesc,status,valveStatus,communityIds,sortColumn,sortOrder);
 
@@ -134,7 +134,7 @@ public class DeviceServiceImpl implements DeviceService{
         LoginUser loginUser = UserUtil.getCurrentUser();
         Integer userId = null;
         List<Integer> communityIds = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
         if (orgId != null) communityIds = organizationMapper.findCommunityIds(orgId);
         List<BuildingSelectInfoDto> list = deviceMapper.deviceAreaList(loginUser.getSiteId(),userId,sysId,deviceTypeId,orgId,province,city,region,communityId,buildingId,deviceNo,clientName,locDesc,status,valveStatus,communityIds);
         return buildingService.areaList(list);

src/main/java/com/zoniot/ccrc/service/impl/StatAndAnalysisServiceImpl.java

@@ -47,7 +47,7 @@ public class StatAndAnalysisServiceImpl implements StatAndAnalysisService {
             latitudeMax = Double.valueOf(northEastStr[1]);
         }
         Integer userId = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
 
         List<BuildingInfoListDto> buildingInfoListDtoList = deviceMapper.getBuildingStatistics(loginUser.getSiteId(),sysId, userId, null, province, city, region,  community, type, longitudeMin, longitudeMax, latitudeMin, latitudeMax);
         return this.mapStatistical(type, buildingInfoListDtoList);

src/main/java/com/zoniot/ccrc/service/impl/WarningLogServiceImpl.java

@@ -54,7 +54,7 @@ public class WarningLogServiceImpl implements WarningLogService {
     public Pagination<WarningLogDto> getList(Long deviceId,Integer channelId, String deviceNo, Integer warningType, String clientName, Integer feedbackStatus, Integer provinceId, Integer cityId, Integer regionId, Integer communityId, Integer buildingId, LocalDateTime startDate, LocalDateTime endDate, int pageNum, int pageSize) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         Integer userId = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
         PageHelper.startPage(pageNum,pageSize);
         List<WarningLogDto> list =  warningLogMapper.getList(loginUser.getSiteId(),deviceId,userId,channelId,deviceNo,warningType,clientName,feedbackStatus,provinceId,cityId,regionId,communityId,buildingId,startDate,endDate);
 
@@ -80,7 +80,7 @@ public class WarningLogServiceImpl implements WarningLogService {
     public List<BuildingSelectDto> getAreaList(Integer channelId, String deviceNo, Integer warningType, String clientName, Integer feedbackStatus, LocalDateTime startDate, LocalDateTime endDate) {
         LoginUser loginUser = UserUtil.getCurrentUser();
         Integer userId = null;
-        if (loginUser.getType() == 4) userId = loginUser.getId();
+        if (loginUser.getRoleType() !=null && loginUser.getRoleType() == 4) userId = loginUser.getId();
         List<BuildingSelectInfoDto> buildingList = warningLogMapper.getAreaList(loginUser.getSiteId(),userId,channelId,deviceNo,warningType,clientName,feedbackStatus,startDate,endDate);
         return buildingService.areaList(buildingList);
     }