添加更新基础区域

agent-manager/src/main/java/com/mortals/xhx/module/base/model/vo/GroupAreaInfo.java

@@ -48,10 +48,10 @@ public class GroupAreaInfo {
      * 访问地址
      */
     private String domain;
-    /**
-     * 区域状态 (0.停用，1.正常)
-     */
-    private String status;
+//    /**
+//     * 区域状态 (0.停用，1.正常)
+//     */
+//    private String status;
 
     private List<GroupAreaInfo> sonAreas;
 

agent-manager/src/main/resources/sqlmap/module/base/BaseAreaMapper.xml

@@ -83,7 +83,7 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="BaseAreaEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_base_area
-        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,status,createTime,createUserId,updateTime)
+        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,`status`,createTime,createUserId,updateTime)
         VALUES
         (#{ancestors},#{name},#{iid},#{pid},#{haveSonArea},#{haveSonDept},#{haveGetDept},#{haveGetMatterList},#{areaCode},#{areaLevel},#{shortName},#{domain},#{status},#{createTime},#{createUserId},#{updateTime})
     </insert>
@@ -91,7 +91,7 @@
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_base_area
-        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,status,createTime,createUserId,updateTime)
+        (ancestors,name,iid,pid,haveSonArea,haveSonDept,haveGetDept,haveGetMatterList,areaCode,areaLevel,shortName,domain,`status`,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
             (#{item.ancestors},#{item.name},#{item.iid},#{item.pid},#{item.haveSonArea},#{item.haveSonDept},#{item.haveGetDept},#{item.haveGetMatterList},#{item.areaCode},#{item.areaLevel},#{item.shortName},#{item.domain},#{item.status},#{item.createTime},#{item.createUserId},#{item.updateTime})
@@ -144,10 +144,10 @@
                 a.domain=#{data.domain},
             </if>
             <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
-                a.status=#{data.status},
+                a.`status`=#{data.status},
             </if>
             <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
-                a.status=ifnull(a.status,0) + #{data.statusIncrement},
+                a.`status`=ifnull(a.status,0) + #{data.statusIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},