Merge remote-tracking branch 'origin/master'

src/main/resources/mapping/cquery/SysLogCQuery.xml

@@ -15,8 +15,8 @@
         <if test="startDate != null">
             and l.logTime <![CDATA[ >= ]]> #{startDate}
         </if>
-        <if test="startDate != null ">
-            and l.logTime <![CDATA[ < ]]> date_add(#{startDate}, interval 1 day)
+        <if test="endDate != null ">
+            and l.logTime <![CDATA[ <= ]]> #{endDate}
         </if>
         order by l.logTime desc
     </select>

vue/src/views/companyService/company/edit.vue

@@ -785,10 +785,10 @@ export default defineComponent(
     mounted() {
       const id = history.state.params?.id;
       const op = history.state.params?.op;
-      if (op == 1) {
+      if (op == 1 || id == null) {
         this.operationType = "add"
       }
-      if (op == 2) {
+      if (op == 2 || id != null) {
         this.operationType = "edit"
       }
       this.loadData(id);