修改同步用户

doc/api.md

@@ -2583,18 +2583,20 @@ data| object  |数据对象
 
 **请求参数:**
 
-参数名称|类型|必填|描述
-:---|:---|:---|:------
-page|Integer|否|当前页
-size|Integer|否|每页条数，值为-1，查询所有记录
+参数名称| 类型      |必填|描述
+:---|:--------|:---|:------
+page| Integer |否|当前页
+size| Integer |否|每页条数，值为-1，查询所有记录
 deviceCode| String  |否|设备编码
+meetStatusList| arrays  |否|会议状态列表(0.等待中,1.进行中,2.已结束)
 
 **请求样例:**
 ```
   {
         "page":1,
         "size":10,
-        "deviceCode","adfdd"
+        "deviceCode","adfdd",
+        "meetStatusList":[0,1]
   }
 
 ```

smart-office-manager-ui/admin/src/views/workman/drawershow.vue

@@ -58,7 +58,7 @@
                 direction:"rtl",
                 toString:[
                     "sex",
-                    "roomId",
+                    "roomId"
                 ],
                 toDate:[
                 ],

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/model/vo/MettingRecordVo.java

@@ -24,4 +24,6 @@ public class MettingRecordVo extends BaseEntityLong {
 
     private String deviceCode;
 
+    private List <Integer> meetStatusList;
+
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java

@@ -52,7 +52,12 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
     @Override
     protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException {
         super.doListBefore(query, model, context);
-        query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+
+        if(ObjectUtils.isEmpty(query.getOrderColList())){
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        }else{
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
 
         if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
             //根据设备编码 查询房间room