Merge remote-tracking branch 'origin/MVP1.5.8' into MVP1.5.8

yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysMenuMapper.xml

@@ -58,22 +58,24 @@
         <include refid="Base_Column_List"/>
         FROM sys_menu a
         <where>
-            1=1
+            1=1 AND a.DELETE_STATUS = '1'
             <include refid="sysMenu_where"/>
         </where>
+		order by a.CREATE_TIME desc
     </select>
 
 	<select id="selectMenuId" resultType="java.lang.Long">
 		SELECT
 		 	count(1)
 		FROM modeling_app_model a
-		where a.fd_id = #{modelId}
+		WHERE a.fd_id = #{modelId}
 	</select>
 
 	<select id="selectColumnList" resultType="java.lang.String">
 		SELECT
 			a.fd_column
 		FROM sys_xform_db_column a
-		where a.fd_main_id = #{modelId}
+		LEFT JOIN sys_xform_db_table b on a.fd_main_id = b.fd_id
+		WHERE b.fd_model_id = #{modelId}
 	</select>
 </mapper>