diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
index fb9655aa..dc2a8334 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
@@ -271,6 +271,6 @@ public class TmTask implements Serializable {
     private int souceBy;
 
     /**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/
-    private int orderStatus;
+    private Integer orderStatus;
 
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index ccae0771..d3c2b4a2 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -534,11 +534,11 @@
       GROUP BY tt.task_id
       order by
       case when #{record.orderStatus} = 0 then tt.update_time
-            when #{record.orderStatus} = 1 then tt.update_time
+            when #{record.orderStatus} = 1 or #{record.orderStatus} is null then tt.update_time
             when #{record.orderStatus} = 2 then tt.task_status
             when #{record.orderStatus} = 3 then tt.task_status
       end
-      <if test="record.orderStatus == 1 or record.orderStatus == 3">
+      <if test="record.orderStatus == 1 or record.orderStatus == 3 or record.orderStatus == null">
         desc
       </if>
   </select>
@@ -1033,11 +1033,11 @@
     GROUP BY tt.task_id
     order by
     case when #{record.orderStatus} = 0 then tt.update_time
-          when #{record.orderStatus} = 1 then tt.update_time
+          when #{record.orderStatus} = 1 or #{record.orderStatus} is null then tt.update_time
           when #{record.orderStatus} = 2 then tt.task_status
           when #{record.orderStatus} = 3 then tt.task_status
     end
-    <if test="record.orderStatus == 1 or record.orderStatus == 3">
+    <if test="record.orderStatus == 1 or record.orderStatus == 3 or record.orderStatus == null">
       desc
     </if>
   </select>
diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue
index c8b5c872..56a4afca 100644
--- a/sgzb-ui/src/views/base/comeAndGo/index.vue
+++ b/sgzb-ui/src/views/base/comeAndGo/index.vue
@@ -450,7 +450,7 @@ export default {
                     this.isLoading = true
                     if (this.form.unitId != undefined) {
                         console.log(this.form)
-                        /*updateUnit(this.form)
+                        updateUnit(this.form)
                             .then((response) => {
                                 this.$modal.msgSuccess('修改成功')
                                 this.open = false
@@ -459,7 +459,7 @@ export default {
                             })
                             .catch(() => {
                                 this.isLoading = false
-                            })*/
+                            })
                     } else {
                         console.log(this.form)
                         addUnit(this.form)