Merge branch 'developer' into 'master'

Developer

See merge request !3

src/main/java/com/gic/plug/web/controller/StoreFieldController.java

@@ -120,7 +120,7 @@ public class StoreFieldController {
         for (StoreFieldDTO dto : dtoList) {
             //不需要文本类型字段
             if(!userRegion.isEmpty()){
-                if(!userRegion.contains(dto.getStoreRegionId())){
+                if(!userRegion.contains(dto.getStoreRegionId()+"")){
                     continue;
                 }
             }

src/main/java/com/gic/plug/web/controller/goods/AppletConfigGoodsController.java

@@ -215,10 +215,11 @@ public class AppletConfigGoodsController extends BaseGoodsController {
         } else if (Constant.CHANNEL_CODE_ERP.equals(channelCode)) {
             searchCode = "erp_goods";
         }
-        String esName = esScreeningSearchService.getCurrentEsName("1129", searchCode);
+        String enterpriseId = getEnterpriseId() + "";
+        String esName = esScreeningSearchService.getCurrentEsName(enterpriseId, searchCode);
         searchDTO.setIndexName(esName);
         searchDTO.setColumnCategoryCode(searchCode);
-        searchDTO.setEnterpriseId("1129");
+        searchDTO.setEnterpriseId(enterpriseId);
         searchDTO.setType("mapper_type");
         searchDTO.setBegin((currentPage - 1) * pageSize);
         searchDTO.setRecordNumber(pageSize);