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

coolstore-partner-model/src/main/java/com/cool/store/request/IntentAreaSettingRequest.java

@@ -22,7 +22,7 @@ public class IntentAreaSettingRequest {
     @ApiModelProperty("战区名称")
     private String zoneName;
     @ApiModelProperty("组织机构ID集合")
-    private List<Long> orgIdList;
+    private List<String> orgIdList;
     @ApiModelProperty("开放区域id集合")
     private List<Long> openAreaIdList;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/EnterpriseUserSingleInfoVO.java

@@ -1,6 +1,12 @@
 package com.cool.store.vo;
 
+import com.cool.store.entity.EnterpriseUserDO;
+import com.google.common.collect.Lists;
 import lombok.Data;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -15,4 +21,19 @@ public class EnterpriseUserSingleInfoVO {
     private String userName;
 
     private String mobile;
+
+    public static List<EnterpriseUserSingleInfoVO> convertVO(List<EnterpriseUserDO> userList){
+        if(CollectionUtils.isEmpty(userList)){
+            return Lists.newArrayList();
+        }
+        List<EnterpriseUserSingleInfoVO> resultList = new ArrayList<>();
+        for (EnterpriseUserDO enterpriseUser : userList) {
+            EnterpriseUserSingleInfoVO result = new EnterpriseUserSingleInfoVO();
+            result.setUserId(enterpriseUser.getUserId());
+            result.setUserName(enterpriseUser.getName());
+            result.setMobile(enterpriseUser.getMobile());
+            resultList.add(result);
+        }
+        return resultList;
+    }
 }