Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 15944a2bdd1db10ac3313d10575119f6d3a75a8a
+  newTag: da27c9d2ba624fd8400d37a7ae0b4d7a735ce3aa

release-service/src/main/resources/mapper/licence/LicenceBackgroundDao.xml

@@ -27,7 +27,6 @@
     </insert>
 
 
-
     <select id="countId" resultType="java.lang.Integer">
         select count(*)
         from license_organizations
@@ -94,17 +93,11 @@
     </update>
 
 
-
-
-
-
-
-
     <insert id="insertProject" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.mmc.csf.release.entity.licence.LicenseOrganizationsDO">
         insert into license_training_programs(grade_id, models_id, type_id, price, place, main_image, create_time,
-                                              update_time,org_id)
-        values (#{gradeId}, #{modelsId}, #{typeId}, #{price}, #{place}, #{mainImage}, NOW(), NOW(),#{orgId})
+                                              update_time, org_id)
+        values (#{gradeId}, #{modelsId}, #{typeId}, #{price}, #{place}, #{mainImage}, NOW(), NOW(), #{orgId})
     </insert>
 
     <update id="updateProject" parameterType="com.mmc.csf.release.entity.licence.LicenseTrainingProgramsDO">
@@ -160,7 +153,7 @@
         LEFT JOIN licence_scale ls ON lo.scale_id = ls.id
         where 1=1
         <if test=" name != null and name != '' ">
-            and lo.`name` =#{name}
+            and lo.`name` like CONCAT('%',#{name},'%')
         </if>
         <if test=" startTime != null and startTime != '' and endTime != null and endTime != '' ">
             and DATE_FORMAT(create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}
@@ -197,7 +190,7 @@
         LEFT JOIN licence_scale ls ON lo.scale_id = ls.id
         where 1=1
         <if test=" name != null and name != '' ">
-            and lo.`name` =#{name}
+            and lo.`name` like CONCAT('%',#{name},'%')
         </if>
         <if test=" startTime != null and startTime != '' and endTime != null and endTime != '' ">
             and DATE_FORMAT(create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}