Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/mk/MkActivityFormServiceImpl.java

@@ -110,6 +110,10 @@ public class MkActivityFormServiceImpl implements MkActivityFormService {
                 map.put("mkCode",mkCode);
                 List<MkActivitiesAssociationEntity> mkActivitiesAssociationEntities = mkActivitiesAssociationService.queryList(map);
                 logger.debug("营销活动-活动关联表数据:{}",JacksonUtil.toJson(mkActivitiesAssociationEntities));
+                if (mkActivitiesAssociationEntities.isEmpty()){
+                    //查询出来的活动关联为空
+                    continue;
+                }
                 List<Long> mkaIds = mkActivitiesAssociationEntities.stream().map(bean -> bean.getMkaId()).collect(Collectors.toList());
                 Long[] longs = mkaIds.toArray(new Long[]{});
 //            mkActivitiesAssociationEntities.stream().map(Long::get).collect(Collectors.toList());

kmall-admin/src/main/resources/mybatis/mapper/mk/MkActivityFormDao.xml

@@ -152,7 +152,7 @@
 		left join mall_store s on s.merch_sn = a2.merch_sn and s.third_party_merch_code = a2.third_merch_sn and s.id = a2.mka_store_id
 		WHERE 1=1
 		<if test="mkCode != null and mkCode.trim() != ''">
-			AND a2.mk_code LIKE concat('%',#{mkCode},'%')
+			AND a2.mk_code =#{mkCode}
 		</if>
         <if test="topic != null and topic.trim() != ''">
             AND a.mka_topic LIKE concat('%',#{topic},'%')

kmall-admin/src/main/webapp/WEB-INF/page/mk/mkactivityform.html

@@ -34,7 +34,10 @@
     <Card v-show="!showList">
         <p slot="title">{{title}}</p>
 		<i-form ref="formValidate" :model="mkActivityForm" :rules="ruleValidate" :label-width="80">
-            <Form-item label="活动形式代码" prop="mkCode">
+            <Form-item v-if="isMkactivityformUpdate" label="活动形式代码" prop="mkCode">
+                <i-input v-model="mkActivityForm.mkCode" disabled placeholder="活动形式代码"/>
+            </Form-item>
+            <Form-item v-else label="活动形式代码" prop="mkCode">
                 <i-input v-model="mkActivityForm.mkCode" placeholder="活动形式代码"/>
             </Form-item>
             <Form-item label="活动形式名称" prop="mkName">

kmall-admin/src/main/webapp/js/mk/mkactivityform.js

@@ -235,7 +235,9 @@ let vm = new Vue({
             }*/
         ],
         // 区分增加还是修改
-        isAdd:false
+        isAdd:false,
+        // 区分活动形式表增加/修改
+        isMkactivityformUpdate:false
 	},
 	methods: {
 		query: function () {
@@ -246,6 +248,7 @@ let vm = new Vue({
             vm.showMkactivitiesViewList = true;
             vm.showList = false;
             vm.title = "新增";
+            vm.isMkactivityformUpdate=false
 			vm.mkActivityForm = {};
 		},
 		update: function (event) {
@@ -257,6 +260,7 @@ let vm = new Vue({
             vm.showMkactivitiesViewList = true;
             vm.showList = false;
             vm.title = "修改";
+            vm.isMkactivityformUpdate=true
 
             vm.getInfo(mmId)
 		},