Merge branch 'opentiny:develop' into develop

Author: lu-yg

app/src/main/resources/sql/mysql/init_data_for_test.sql

@@ -53,6 +53,8 @@ INSERT INTO `t_block_history` (`id`, `ref_id`, `message`, `version`, `label`, `n
 
 INSERT INTO `t_block_group` (`id`, `name`, `app_id`, `platform_id`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, '我的分组', 1, 1, '区块分组', '1', '1', '2024-10-16 19:15:53', '2024-10-16 19:15:53', '1', '1');
 
+INSERT INTO `r_block_group_block` VALUES (1, 1, 1);
+
 INSERT INTO `t_material_history` (`id`, `ref_id`, `version`, `content`, `name`, `npm_name`, `framework`, `assets_url`, `image_url`, `description`, `material_size`, `tgz_url`, `unzip_tgz_root_path_url`, `unzip_tgz_files`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`, `tenant_id`, `site_id`) VALUES (1, 1, '1.0.8', '{}', 'materialstwo', '@opentiny/lowcode-alpha-material-materialstwo-1505', 'Vue', '{\"material\":[\"\"],\"scripts\":[\"\",\"\"],\"styles\":[]}', NULL, '1.0.8', NULL, NULL, NULL, NULL, '1', '1', '2024-10-16 19:28:53', '2024-10-16 19:28:53', '1', '1');
 
 INSERT INTO `t_tenant` (`id`, `name_cn`, `name_en`, `description`, `created_by`, `last_updated_by`, `created_time`, `last_updated_time`) VALUES (1, 'public', '公共租户', 'Default tenant for new user to explore.', '1', '1', '2024-10-16 19:31:28', '2024-10-16 19:31:28');

base/src/main/resources/mappers/AppExtensionMapper.xml

@@ -147,9 +147,7 @@
             <include refid="AppExtensionSetColumns"/>
         </set>
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
             <if test="tenantId != null">
                 AND tenant_id = #{tenantId}
             </if>

base/src/main/resources/mappers/AppMapper.xml

@@ -328,9 +328,7 @@
         <include refid="Base_Column_List"/>
         FROM t_app
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/BlockGroupMapper.xml

@@ -324,9 +324,7 @@
             </otherwise>
         </choose>
         <where>
-            <if test="id != null">
-                AND bg.id = #{id}
-            </if>
+            bg.id = #{id}
             <if test="groupCreatedBy != null">
                 AND bg.created_by = #{groupCreatedBy}
             </if>

base/src/main/resources/mappers/BlockHistoryMapper.xml

@@ -249,9 +249,7 @@
         <include refid="Base_Column_List"/>
         FROM t_block_history
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/BlockMapper.xml

@@ -243,9 +243,7 @@
         <include refid="Base_Column_List"/>
         FROM t_block
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/ComponentLibraryMapper.xml

@@ -337,9 +337,7 @@
         FROM t_component_library CL
         LEFT JOIN t_component C ON CL.id = C.library_id
         <where>
-            <if test="id != null">
-                AND CL.id = #{id}
-            </if>
+            CL.id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/ComponentMapper.xml

@@ -257,9 +257,7 @@
         <include refid="Base_Column_List"/>
         FROM t_component
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/DatasourceMapper.xml

@@ -129,9 +129,7 @@
         <include refid="Base_Column_List"/>
         FROM t_datasource
         <where>
-            <if test="id != null">
-                AND id = #{id}
-            </if>
+            id = #{id}
         </where>
     </select>
 

base/src/main/resources/mappers/I18nEntryMapper.xml

@@ -154,9 +154,7 @@
         FROM t_i18n_entry E
         LEFT JOIN t_i18n_lang L ON E.lang_id = L.id
         <where>
-            <if test="id != null">
-                AND E.id = #{id}
-            </if>
+            E.id = #{id}
         </where>
     </select>