日志分页查询时同时匹配公司和部门

user_center/src/main/resources/mapper/LoginLogMapper.xml

@@ -158,7 +158,7 @@
                 and a.company_id = #{loginLogDto.companyId}
             </if>
             <if test="loginLogDto.departmentId != null">
-                and a.DEPARTMENT_ID = #{loginLogDto.departmentId}
+                and (a.DEPARTMENT_ID = #{loginLogDto.departmentId} or a.company_id = #{loginLogDto.departmentId})
             </if>
             <if test="loginLogDto.beginTime != null">
                 and a.create_time >= #{loginLogDto.beginTime}

user_center/src/main/resources/mapper/OperateLogMapper.xml

@@ -154,7 +154,7 @@
                 and a.company_id = #{operateLogDto.companyId}
             </if>
             <if test="operateLogDto.departmentId != null">
-                and a.DEPARTMENT_ID = #{operateLogDto.departmentId}
+                and (a.DEPARTMENT_ID = #{operateLogDto.departmentId} or a.company_id = #{operateLogDto.departmentId})
             </if>
             <if test="operateLogDto.beginTime != null">
                 and a.create_time >= #{operateLogDto.beginTime}