修复xx病激活，菜单回显

src/main/resources/mapper/IotDeviceMapper.xml

@@ -33,9 +33,9 @@
         <result property="devModifieddate" column="devModifieddate"/>
         <result property="devCreateddate" column="devCreateddate"/>
         <result property="devDelstatus" column="devDelstatus"/>
-        <result property="devOriginalid"    column="devOriginalid"    />
-        <result property="devHostingstatus"    column="devHostingstatus"    />
-        <result property="extInfo"    column="extInfo"    />
+        <result property="devOriginalid" column="devOriginalid"/>
+        <result property="devHostingstatus" column="devHostingstatus"/>
+        <result property="extInfo" column="extInfo"/>
     </resultMap>
 
     <sql id="selectIotDeviceVo">
@@ -72,18 +72,21 @@
         </foreach>
     </select>
 
-    <select id="selectIotDeviceList" parameterType="IotDevice" resultType="com.yunfeiyun.agmp.iot.common.domain.IotDevice">
+    <select id="selectIotDeviceList" parameterType="IotDevice"
+            resultType="com.yunfeiyun.agmp.iot.common.domain.IotDevice">
         <include refid="selectIotDeviceVo"/>
         <where>
             devDelstatus = '0'
-            <if test="devCode != null  and devCode != ''"> and devCode = #{devCode}</if>
-            <if test="firmBid != null  and firmBid != ''"> and firmBid = #{firmBid}</if>
-            <if test="devtypeBid != null  and devtypeBid != ''"> and devtypeBid = #{devtypeBid}</if>
-            <if test="devStatus != null  and devStatus != ''"> and devStatus = #{devStatus}</if>
+            <if test="devCode != null  and devCode != ''">and devCode = #{devCode}</if>
+            <if test="firmBid != null  and firmBid != ''">and firmBid = #{firmBid}</if>
+            <if test="devtypeBid != null  and devtypeBid != ''">and devtypeBid = #{devtypeBid}</if>
+            <if test="devStatus != null  and devStatus != ''">and devStatus = #{devStatus}</if>
             <if test="devModifieddate != null  and devModifieddate != ''">
                 and devModifieddate <![CDATA[ <= ]]> #{devModifieddate}
             </if>
-            <if test="devUpdateddate != null  and devUpdateddate != ''"> and devUpdateddate <![CDATA[ <= ]]> #{devUpdateddate}</if>
+            <if test="devUpdateddate != null  and devUpdateddate != ''">and devUpdateddate <![CDATA[ <= ]]>
+                #{devUpdateddate}
+            </if>
         </where>
     </select>
 
@@ -207,7 +210,7 @@
         where devBid = #{devBid} and devDelstatus = '0'
     </update>
     <update id="updateIotDeviceExtInfo">
-        update  IotDevice set extInfo=#{extInfo}, devStatus='1' where  devBid=#{devBid}
+        update  IotDevice set extInfo=#{extInfo}, devStatus='1' ,devUpdateddate=#{updateDate} ,devModifieddate=#{updateDate} where  devBid=#{devBid}
     </update>
     <update id="updateIotDeviceByDevCodeAndFirmDev">
         update IotDevice
@@ -245,7 +248,8 @@
         where devCode = #{devCode} and firmBid = #{firmBid} and devtypeBid = #{devtypeBid}
     </update>
     <update id="updateIotDeviceStatusByDevCodeList">
-        update IotDevice set devStatus = #{devStatus} where devtypeBid = #{devtypeBid} and firmBid = #{firmBid} and devCode in
+        update IotDevice set devStatus = #{devStatus} where devtypeBid = #{devtypeBid} and firmBid = #{firmBid} and
+        devCode in
         <foreach item="item" collection="list" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -520,8 +524,8 @@
     <select id="selectIotDeviceByDevtypeBidList" resultType="com.yunfeiyun.agmp.iot.common.domain.IotDevice">
         <include refid="selectIotDeviceVo"/>
         <where>
-             devDelstatus='0'
-             and
+            devDelstatus='0'
+            and
             devtypeBid in
             <foreach collection="list" open="(" separator="," close=")" item="item" index="index">
                 #{item}