Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/util/OrgInfoUtil.java

@@ -24,6 +24,9 @@ public class OrgInfoUtil {
             Map<String,String>keysValues=updateOrgInfo(key);
             keysValue=keysValues.get(id+"");
         }
+        if(keysValue==null){
+            return "";
+        }
         return keysValue;
     };
     public Map<String,String>getAllOrgName(){