Forráskód Böngészése

属性模版状态判断,改为仅必填项检查

欧阳劲驰 2 hónapja
szülő
commit
d9e1c05d96

+ 1 - 1
src/main/java/com/shkpr/service/alambizplugin/components/checker/InvalidPropertiesFinder.java

@@ -176,7 +176,7 @@ public class InvalidPropertiesFinder {
         //遍历图层属性模版
         for (GisMetadataPropertyTemplate propertyTemplate : layerTemplate.getPropertyTemplates()) {
             //排除非必填
-            if (propertyTemplate.getRequired() != 1)
+            if (propertyTemplate.getRequired() != 1 || propertyTemplate.getStatus() != 1)
                 continue;
             //排除编码
             if (Objects.equals(GisSurveyImportDefine.TEMPLATE.CODE, propertyTemplate.getKey())

+ 1 - 2
src/main/resources/mapper/GisMetadataLayerTemplateMapper.xml

@@ -81,9 +81,8 @@
         mpt.update_time as property_update_time
         from k3_gis_metadata_layer_template mlt
         left join k3_gis_metadata_property_template mpt
-        on mlt.nature = mpt.nature and mlt.key = mpt.layer and mpt.status = 1
+        on mlt.nature = mpt.nature and mlt.key = mpt.layer
         where mlt.nature = #{nature,jdbcType=VARCHAR}
-        and mlt.status = 1
         and mlt.name in
         <foreach item="item" index="index" collection="names"
                  open="(" separator="," close=")">