元数据bug

blade-service/blade-business/src/main/java/org/springblade/business/mapper/MetadataClassificationMapper.java

@@ -14,7 +14,7 @@ public interface MetadataClassificationMapper extends BaseMapper<MetadataClassif
 
     MetadataClassification classificationDetail(@Param("type") Integer type);
     void alterTabFiled(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
-    void updateFiledType(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
+    void updateFiledType(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName,@Param("fieldNameNow") String initTabFieldNameNow, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
     MetadataClassification selectMetadaOne(@Param("containerName") String containerName,@Param("code") String code,@Param("fieldKey") String fieldKey,@Param("id") Long id);
 
     void updateMetadataBytype(@Param("ids") List<Long> ids, @Param("type") String type);

blade-service/blade-business/src/main/java/org/springblade/business/mapper/MetadataClassificationMapper.xml

@@ -29,16 +29,16 @@
     </insert>
 
     <update id="updateFiledType">
-        alter table ${tabName} MODIFY ${fieldName} ${fieldType}(${fieldLength})
+        ALTER TABLE ${tabName} CHANGE `${fieldName}` `${fieldNameNow}` ${fieldType}(${fieldLength})
     </update>
 
     <update id="alterTabFiled">
-        alter table ${tabName} add column ${fieldName} ${fieldType}(${fieldLength})
+        alter table ${tabName} add column `${fieldName}` ${fieldType}(${fieldLength})
     </update>
 
 
     <update id="deleteTableField">
-        alter table ${containerInitTabName} drop column ${fieldKey}
+        alter table ${containerInitTabName} drop column `${fieldKey}`
     </update>
 
     <update id="updateData">

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MetadataClassificationServiceImpl.java

@@ -92,10 +92,12 @@ public class MetadataClassificationServiceImpl
                     filetype = "datetime";
                     fileLength = 6;
                 }
+                String oldFieldKey = obj.getFieldKey();
+                obj.setFieldKey("file_key_"+obj.getCode().toLowerCase());
                 obj.setUpdateTime(new Date());
                 obj.setUpdateUser(user.getUserId());
                 baseMapper.updateById(obj);
-                baseMapper.updateFiledType(obj.getContainerInitTabName(),obj.getFieldKey(),filetype,fileLength);
+                baseMapper.updateFiledType(obj.getContainerInitTabName(),oldFieldKey,obj.getFieldKey(),filetype,fileLength);
             }
             return true;
         } catch (Exception e) {

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -417,7 +417,7 @@
         FROM
         m_archive_tree_contract d
         WHERE
-        d.is_deleted = 0
+        d.is_deleted = 0 and d.id in
         <foreach item="id" collection="idsList" open="(" close=")" separator=",">
             #{id}
         </foreach>