Merge branch 'feature/五月需求迭代' of…

Merge branch 'feature/五月需求迭代' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/五月需求迭代

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

@@ -187,7 +187,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         //已关联的成员需要查询关联的品牌名称
         List<TabHaobanWxEnterpriseRelated> list = wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
         //解决空指针异常问题
-        Map<String, Object> map = list.stream().collect(Collectors.toMap(TabHaobanWxEnterpriseRelated::getEnterpriseId, a->Optional.ofNullable(a.getEnterpriseName())));
+        Map<String, String> map = list.stream().collect(HashMap::new,(k, v) -> k.put(v.getEnterpriseId(), v.getEnterpriseName()), HashMap::putAll);
         List<StaffClerkRelationDTO> relationDTOList = staffClerkRelationService.listByWxEnterpriseIdAndStaffId(wxEnterpriseId, staffIdList);
         staffDTOList.forEach(one -> {
             if(relationIdList.contains(one.getStaffId())){
@@ -196,7 +196,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                 List<String> enterpriseNameList = new ArrayList<>(8);
                 for (StaffClerkRelationDTO dto : relationDTOList){
                     if (dto.getStaffId().equals(one.getStaffId())){
-                        enterpriseNameList.add(String.valueOf(map.get(dto.getEnterpriseId())));
+                        enterpriseNameList.add(map.get(dto.getEnterpriseId()));
                     }
                 }
                 if (CollUtil.isNotEmpty(enterpriseNameList)){

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WxEnterpriseVO.java

@@ -102,6 +102,7 @@ public class WxEnterpriseVO implements Serializable {
     private Integer wxSecurityType ;
     private String wxCorpid ;
     private String openCorpid ;
+    private String wxaAppid ;
     
     public Integer getWxSecurityType() {
         return wxSecurityType;
@@ -466,4 +467,12 @@ public class WxEnterpriseVO implements Serializable {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public String getWxaAppid() {
+        return wxaAppid;
+    }
+
+    public void setWxaAppid(String wxaAppid) {
+        this.wxaAppid = wxaAppid;
+    }
 }