Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/building/list/add/components/base.jsx

@@ -218,6 +218,7 @@ function AddBuilding(props) {
    * @param {*} tags 
    */
   function tagFilter(tags, keyType) {
+    debugger
     console.log(tags)
     if (!tags) {
       return null
@@ -230,15 +231,17 @@ function AddBuilding(props) {
     const determineTag = poi.map(p => {
       if (p.key === keyType) {
         if (typeof p.data === 'string') {
-          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name)) || []
+          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name))
         } else {
-          p.data = p.data.filter(x => tags.some(t => !t.automatic || t.tagName === x.name))
+          p.data = p.data.filter(f => automaticTag.includes(f.name))
         }
       }
       return p
     })
 
     setPoi(determineTag)
+
+    debugger
     return tags.filter(f => f.automatic === false).map(x => x.tagName).join(',')
   }