diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 7bdab1d..4fe836f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -34,7 +34,7 @@ FROM alarm_records ar JOIN bus_device_well rdv ON ar.device_id = rdv.device_id JOIN bus_well_info wi ON rdv.well_id = wi.ID - JOIN alarm_job aj ON ar.job_id = aj.ID + LEFT JOIN alarm_job aj ON ar.job_id = aj.ID WHERE rdv.VALID = '1' diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 7bdab1d..4fe836f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -34,7 +34,7 @@ FROM alarm_records ar JOIN bus_device_well rdv ON ar.device_id = rdv.device_id JOIN bus_well_info wi ON rdv.well_id = wi.ID - JOIN alarm_job aj ON ar.job_id = aj.ID + LEFT JOIN alarm_job aj ON ar.job_id = aj.ID WHERE rdv.VALID = '1' 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 a2c89bd..44bb9e7 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 @@ -96,7 +96,7 @@ return ResponseData.success(); } - @GetMapping(value = "/getAuthorByDept") + @GetMapping(value = "0/getAuthorByDept") @ResponseBody public Object getAuthorByDept() { SuccessResponseData resultData = new SuccessResponseData(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index 7bdab1d..4fe836f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -34,7 +34,7 @@ FROM alarm_records ar JOIN bus_device_well rdv ON ar.device_id = rdv.device_id JOIN bus_well_info wi ON rdv.well_id = wi.ID - JOIN alarm_job aj ON ar.job_id = aj.ID + LEFT JOIN alarm_job aj ON ar.job_id = aj.ID WHERE rdv.VALID = '1' 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 a2c89bd..44bb9e7 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 @@ -96,7 +96,7 @@ return ResponseData.success(); } - @GetMapping(value = "/getAuthorByDept") + @GetMapping(value = "0/getAuthorByDept") @ResponseBody public Object getAuthorByDept() { SuccessResponseData resultData = new SuccessResponseData(); 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..a8cd989 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 @@ -29,7 +29,7 @@ /** * 主键 */ - @TableId(value = "ID", type = IdType.ASSIGN_ID) + @TableId(value = "ID", type = IdType.AUTO) private Long id; /** * 部门主键