更新

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceBindParam.java

@@ -15,7 +15,7 @@ public class DeviceBindParam extends SuperParam {
     @Schema(description = "设备ID、设备号")
     private String deviceId;
 
-    @Schema(description = "学校信息Oid")
+    @Schema(description = "学校信息Oid", hidden = true)
     private String schoolInfoOid;
 
     @Schema(description = "商户Oid")

FullCardClient/src/main/java/com/zhongshu/card/client/model/school/DeviceBindSearch.java

@@ -27,7 +27,7 @@ public class DeviceBindSearch extends SuperSearch {
     private DeviceType deviceType;
 
     @Schema(description = "是否在线")
-    private OnLineState onLineState = OnLineState.OnLine;
+    private OnLineState onLineState;
 
     @Schema(description = "关联的项目code")
     private String projectInfoCode;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/DeviceBindServiceImpl.java

@@ -58,6 +58,9 @@ public class DeviceBindServiceImpl extends SuperService implements DeviceBindSer
     @Override
     public ResultContent addDeviceBind(DeviceBindParam param) {
         initDefaultUserAndOid(param);
+        param.setOid(getCurrentOid());
+
+        param.setSchoolInfoOid(param.getOid());
         Assert.hasText("deviceId不能为空", param.getDeviceId());
         Assert.hasText("schoolInfoOid不能为空", param.getSchoolInfoOid());
         Assert.hasText("shopInfoOid不能为空", param.getShopInfoOid());
@@ -156,6 +159,7 @@ public class DeviceBindServiceImpl extends SuperService implements DeviceBindSer
     @Override
     public ResultContent<Page<DeviceBindModel>> page(DeviceBindSearch param, Pageable pageable) {
         initOidSearchParam(param);
+
         Page<DeviceBind> page = deviceBindDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }