Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkInfoDTO.java

@@ -17,6 +17,8 @@ public class StaffClerkInfoDTO implements Serializable {
 
     private String enterpriseId;
 
+    private String BrandName;
+
     private String enterpriseName;
 
     private String storeId;
@@ -121,6 +123,14 @@ public class StaffClerkInfoDTO implements Serializable {
         this.enterpriseId = enterpriseId == null ? null : enterpriseId.trim();
     }
 
+    public String getBrandName() {
+        return BrandName;
+    }
+
+    public void setBrandName(String brandName) {
+        BrandName = brandName;
+    }
+
     public String getStoreId() {
         return storeId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -144,7 +144,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             if (!nameMap.containsKey(infoDTO.getEnterpriseId())) {
                 EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
                 if (null != enterpriseDTO) {
-                    nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName());
+                    nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName()+"_"+enterpriseDTO.getBrandName());
                 } else {
                     nameMap.put(infoDTO.getEnterpriseId(), "未知商户");
                 }
@@ -173,7 +173,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
 
             infoDTO.setClerkName(nameMap.get(infoDTO.getClerkId()));
             infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
-            infoDTO.setEnterpriseName(nameMap.get(infoDTO.getEnterpriseId()));
+            if (nameMap.get(infoDTO.getEnterpriseName())!=null){
+                String EnterpriseandBrandName= nameMap.get(infoDTO.getEnterpriseName());
+                String split[]=EnterpriseandBrandName.split("_");
+                infoDTO.setEnterpriseName(split[0]);
+                if (split[1]!=null)infoDTO.setBrandName(split[1]);
+            }
+//            infoDTO.setEnterpriseName(nameMap.get(infoDTO.getEnterpriseId()));
         });
         return infoDTOS;
     }