Merge branch 'master' of https://github.com/java110/MicroCommunity

WebService/src/main/resources/components/serviceProvidePackage/add-serviceProvide/addServiceProvide.js

@@ -99,7 +99,7 @@
                     return;
                 }
 
-                vc.component.addServiceProvideInfo.communityId = vc.getCurrentCommunity().communityId;
+                //vc.component.addServiceProvideInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
                 if (vc.notNull($props.callBackListener)) {
                     vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addServiceProvideInfo);

WebService/src/main/resources/components/serviceProvidePackage/edit-serviceProvide/editServiceProvide.js

@@ -24,7 +24,7 @@
                 vc.component.refreshEditServiceProvideInfo();
                 $('#editServiceProvideModel').modal('show');
                 vc.copyObject(_params, vc.component.editServiceProvideInfo);
-                vc.component.editServiceProvideInfo.communityId = vc.getCurrentCommunity().communityId;
+                //vc.component.editServiceProvideInfo.communityId = vc.getCurrentCommunity().communityId;
             });
         },
         methods: {

java110-db/src/main/resources/mapper/store/StoreServiceDaoImplMapper.xml

@@ -453,7 +453,7 @@
 
     <!-- 查询商户 -->
     <select id="getStores" parameterType="Map" resultType="Map">
-        select s.store_id,s.b_id,s.user_id,s.name,s.name storeName,s.address,s.tel,
+        select s.store_id,s.b_id,s.user_id,s.name,s.name storeName,s.address,s.tel,s.store_id storeId,
         s.store_type_cd,s.store_type_cd storeTypeCd, s.nearby_landmarks,s.map_x,s.map_y,s.status_cd,
         st.name storeTypeName
         from s_store s,store_type st
@@ -481,6 +481,13 @@
         <if test="storeId != null and storeId !=''">
             and s.store_id = #{storeId}
         </if>
+        <if test="storeIds !=null">
+            and s.store_id in
+            <foreach collection="storeIds" open="(" close=")"
+                     separator="," item="item">
+                #{item}
+            </foreach>
+        </if>
         order by s.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}