diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java index 5d71e35..a2c89bd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java @@ -108,7 +108,7 @@ if (deptPermission != null) { deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); - deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); + deptPermission.setCommunications( JSON.parseObject(String.valueOf(deptPermission.getCommunication()), List.class)); } resultData.setData(deptPermission); return resultData; diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java index 5d71e35..a2c89bd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeptConfigController.java @@ -108,7 +108,7 @@ if (deptPermission != null) { deptPermission.setWellTypes(JSON.parseObject(deptPermission.getWellType(), List.class)); deptPermission.setDeviceTypes(JSON.parseObject(deptPermission.getDeviceType(), List.class)); - deptPermission.setCommunications(JSON.parseObject(deptPermission.getCommunication(), List.class)); + deptPermission.setCommunications( JSON.parseObject(String.valueOf(deptPermission.getCommunication()), List.class)); } resultData.setData(deptPermission); return resultData; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java index aad89b7..816b08e 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/DeptPermission.java @@ -69,7 +69,7 @@ @TableField(exist = false) private List deviceTypes; @TableField(exist = false) - private List communications; + private List communications; private String lng; private String lat;