首次提交

ruoyi-admin/src/main/resources/mapper/system/TpDeptMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where 1=1
         where 1=1
         <if test="ssbk != null  and ssbk != ''"> and a.ssbk = #{ssbk}</if>
         <if test="ssbk != null  and ssbk != ''"> and a.ssbk = #{ssbk}</if>
         <if test="dwmc != null  and dwmc != ''"> and a.dwmc like  concat('%', #{dwmc}, '%')  </if>
         <if test="dwmc != null  and dwmc != ''"> and a.dwmc like  concat('%', #{dwmc}, '%')  </if>
-        group by  a.id
+        group by  a.id  order by  sl desc
     </select>
     </select>
 
 
     <insert id="insertTpDept" parameterType="TpDept" useGeneratedKeys="true" keyProperty="id">
     <insert id="insertTpDept" parameterType="TpDept" useGeneratedKeys="true" keyProperty="id">

ruoyi-admin/src/main/resources/mapper/system/TpInfoMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ipdz = #{ip}
         where ipdz = #{ip}
     </select>
     </select>
     <select id="selectTpInfoListjg" resultMap="TpInfoResult">
     <select id="selectTpInfoListjg" resultMap="TpInfoResult">
-        select a.name,a.ipdz,GROUP_CONCAT(b.dwmc) dwmc from tp_info a left join tp_info_cb b on a.id=b.zbid
+        select a.name,a.ipdz,a.create_time,GROUP_CONCAT(b.dwmc) dwmc from tp_info a left join tp_info_cb b on a.id=b.zbid
                      where 1=1
                      where 1=1
         <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         <if test="ipdz != null  and ipdz != ''"> and ipdz like concat('%', #{ipdz}, '%')</if>
         <if test="ipdz != null  and ipdz != ''"> and ipdz like concat('%', #{ipdz}, '%')</if>