Merge remote-tracking branch 'origin/master'

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

@@ -18,19 +18,23 @@ public class OrgInfoUtil {
     public  String getOrgName(Integer id){
 
         String tenantId = UserUtil.getCurrentUser().getTenantId();
+        if(tenantId==null){
+            return "";
+        }
         String key="orgInfo" + tenantId;
         String keysValue = (String) redisUtil.getHashValues(key,id+"");
         if(keysValue==null){
             Map<String,String>keysValues=updateOrgInfo(key);
             keysValue=keysValues.get(id+"");
         }
-        if(keysValue==null){
-            return "";
-        }
+
         return keysValue;
     };
     public Map<String,String>getAllOrgName(){
         String tenantId = UserUtil.getCurrentUser().getTenantId();
+        if(tenantId==null){
+            return new HashMap<>();
+        }
         String key="orgInfo" + tenantId;
         Map<String, String> hashValue = redisUtil.getHashValue(key);
         if(hashValue.size()==0){
@@ -41,6 +45,7 @@ public class OrgInfoUtil {
     private Map<String,String> updateOrgInfo(String key){
 
         Map<String,String>keysValues=new HashMap<>();
+
         List<Org> orgs = userCenterClient.getAllByTenantId();
         for (Org org1 : orgs) {
             keysValues.put(org1.getId()+"",org1.getOrgName());