From 4662e3409863037e146c398d5fc7f7320143f55b Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 25 Nov 2021 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8Cbug=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../community/impl/CommunityServiceImpl.java  |  2 +-
 .../community-introduction-mapper.xml         |  6 +++
 .../residential-introduction-mapper.xml       |  6 +++
 .../resources/templates/building/save.html    |  2 +-
 .../resources/templates/building/update.html  |  4 +-
 .../templates/residential/list-view.html      | 38 +------------------
 .../resources/templates/residential/list.html | 38 +------------------
 7 files changed, 18 insertions(+), 78 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/systemhouse/service/community/impl/CommunityServiceImpl.java b/src/main/java/cn/com/tenlion/systemhouse/service/community/impl/CommunityServiceImpl.java
index 145f955..1562f55 100644
--- a/src/main/java/cn/com/tenlion/systemhouse/service/community/impl/CommunityServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/systemhouse/service/community/impl/CommunityServiceImpl.java
@@ -112,7 +112,7 @@ public class CommunityServiceImpl extends DefaultBaseService implements ICommuni
         if(null != communityDTO) {
             GridDTO gridDTO = gridService.get(communityDTO.getGrid());
             if(null != gridDTO) {
-                communityDTO.setGridName(gridDTO.getAreaName());
+                communityDTO.setGridName(gridDTO.getGridName());
             }
         }
         return communityDTO;
diff --git a/src/main/resources/mybatis/mapper/communityintroduction/community-introduction-mapper.xml b/src/main/resources/mybatis/mapper/communityintroduction/community-introduction-mapper.xml
index b5ae301..3d0bb01 100644
--- a/src/main/resources/mybatis/mapper/communityintroduction/community-introduction-mapper.xml
+++ b/src/main/resources/mybatis/mapper/communityintroduction/community-introduction-mapper.xml
@@ -110,6 +110,12 @@
         </if>
         <if test="video != null and video != ''">
             video = #{video},
+        </if>
+        <if test="photo == null or photo == ''">
+            photo = '',
+        </if>
+        <if test="video == null or video == ''">
+            video = '',
         </if>
             gmt_modified = #{gmtModified},
             modifier = #{modifier},
diff --git a/src/main/resources/mybatis/mapper/residentialintroduction/residential-introduction-mapper.xml b/src/main/resources/mybatis/mapper/residentialintroduction/residential-introduction-mapper.xml
index f3e4e22..a76ac28 100644
--- a/src/main/resources/mybatis/mapper/residentialintroduction/residential-introduction-mapper.xml
+++ b/src/main/resources/mybatis/mapper/residentialintroduction/residential-introduction-mapper.xml
@@ -110,6 +110,12 @@
         </if>
         <if test="video != null and video != ''">
             video = #{video},
+        </if>
+        <if test="photo == null or photo == ''">
+            photo = '',
+        </if>
+        <if test="video == null or video == ''">
+            video = '',
         </if>
             gmt_modified = #{gmtModified},
             modifier = #{modifier},
diff --git a/src/main/resources/templates/building/save.html b/src/main/resources/templates/building/save.html
index e757929..772a4fd 100644
--- a/src/main/resources/templates/building/save.html
+++ b/src/main/resources/templates/building/save.html
@@ -35,7 +35,7 @@
                         </select>
                     </script>
                 </div>
-                <div class="layui-form-item layui-row">
+                <div class="layui-form-item layui-row" pane>
                     <div class="layui-col-lg3">
                         <label class="layui-form-label">楼栋编号</label>
                         <div class="layui-input-block">
diff --git a/src/main/resources/templates/building/update.html b/src/main/resources/templates/building/update.html
index 30b3085..98810d0 100644
--- a/src/main/resources/templates/building/update.html
+++ b/src/main/resources/templates/building/update.html
@@ -27,7 +27,7 @@
                     <input type="hidden" id="residentialName" name="residentialName" class="layui-input" value="" placeholder="请输入小区名称"  maxlength="36">
                     <div class="layui-input-block layui-form" id="residentialNameSelectTemplateBox" lay-filter="residentialNameSelectTemplateBox"></div>
                     <script id="residentialNameSelectTemplate" type="text/html">
-                        <select id="residentialId" name="residentialId" lay-filter="residentialId">
+                        <select id="residentialId" name="residentialId" lay-filter="residentialId" lay-search>
                             <option value="">请选择小区</option>
                             {{# for(var i = 0, item; item = d[i++];) { }}
                             <option value="{{item.residentialId}}">{{item.residentialName}}</option>
@@ -35,7 +35,7 @@
                         </select>
                     </script>
                 </div>
-                <div class="layui-form-item layui-row">
+                <div class="layui-form-item layui-row" pane>
                     <div class="layui-col-lg3">
                         <label class="layui-form-label">楼栋编号</label>
                         <div class="layui-input-block">
diff --git a/src/main/resources/templates/residential/list-view.html b/src/main/resources/templates/residential/list-view.html
index e8c180d..7136feb 100644
--- a/src/main/resources/templates/residential/list-view.html
+++ b/src/main/resources/templates/residential/list-view.html
@@ -84,43 +84,7 @@
                                 return rowData;
                             }
                         },
-                        {field: 'area1Name', width: 180, title: '一级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area2Name', width: 180, title: '二级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area3Name', width: 180, title: '三级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area4Name', width: 180, title: '四级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area5Name', width: 180, title: '五级区域名称', align:'center',
+                        {field: 'location', width: 180, title: '地区', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
diff --git a/src/main/resources/templates/residential/list.html b/src/main/resources/templates/residential/list.html
index 54e2683..44899e9 100644
--- a/src/main/resources/templates/residential/list.html
+++ b/src/main/resources/templates/residential/list.html
@@ -95,43 +95,7 @@
                                 return rowData;
                             }
                         },
-                        {field: 'area1Name', width: 180, title: '一级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area2Name', width: 180, title: '二级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area3Name', width: 180, title: '三级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area4Name', width: 180, title: '四级区域名称', align:'center',
-                            templet: function(row) {
-                                var rowData = row[this.field];
-                                if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
-                                }
-                                return rowData;
-                            }
-                        },
-                        {field: 'area5Name', width: 180, title: '五级区域名称', align:'center',
+                        {field: 'location', width: 180, title: '地区', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {