Merge branch 'master' of http://172.16.120.227:10080/jichaobo/fiveep

fiveep-service/src/main/java/com/bizmatics/service/impl/PlatformAreaServiceImpl.java

@@ -115,7 +115,9 @@ public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMap
             if (platformAreaVoDevice.size()>0){
                 Integer deviceCount = 0;
                 for (int j = 0; j < platformAreaVoDevice.size(); j++) {
-                    if (platformAreaVoSite.get(i).getId()==platformAreaVoDevice.get(j).getId()){
+                    int id1=platformAreaVoSite.get(i).getId();
+                    int id2=platformAreaVoDevice.get(j).getId();
+                    if (id1==id2){
                         deviceCount = deviceCount + platformAreaVoDevice.get(j).getDeviceCount();
                     }
                 }