Merge remote-tracking branch 'origin/dev/ez-security210625' into dev/ez-security210625

dblayer-mbg/src/main/resources/mapper/AbnormalLogMapper.xml

@@ -29,6 +29,7 @@
         <if test="operationIp != null and operationIp != ''">
             AND INET_NTOA(a.operation_ip) like CONCAT('%',#{operationIp},'%')
         </if>
+        order by a.gmt_create desc
     </select>
 
     <select id="getAbnormalLogWayAndIp" resultType="java.lang.String">

dblayer-mbg/src/main/resources/mapper/LoginLogMapper.xml

@@ -23,6 +23,7 @@
         <if test="loginIp != null and loginIp != ''">
             AND INET_NTOA(a.login_ip) like CONCAT('%',#{loginIp},'%')
         </if>
+        order by a.login_date desc
     </select>
 
     <select id="getLoginLogNameAndIp" resultType="java.lang.String">

dblayer-mbg/src/main/resources/mapper/OperationLogMapper.xml

@@ -30,5 +30,6 @@
             <![CDATA[ AND a.operation_date >= #{startDate}]]>
             <![CDATA[ AND a.operation_date <= #{endDate}]]>
         </if>
+            order by a.operation_date desc
     </select>
 </mapper>

security-center/src/main/java/com/lantone/security/aop/LogAspect.java

@@ -40,7 +40,8 @@ public class LogAspect {
      "||execution(public * com.lantone.security.web.FuncManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.HospitalManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.HospitalSetManagementController.*(..))"+
-     "||execution(public * com.lantone.security.web.LogManagementController.*(..))"+
+     "||execution(public * com.lantone.security.web.LogManagementController.*(..))" +
+     "&& !execution(public * com.lantone.security.web.LogManagementController.getOperationLog(..)) "+
      "||execution(public * com.lantone.security.web.RegionManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.RoleManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.UserManagementController.*(..))"