diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index b95e968..d07ffea 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -93,16 +93,6 @@ AND re.DEV_CODE = #{devCode} - - - - AND re.TEMPERATURE 37.2 - - - AND re.TEMPERATURE ]]> 37.2 - - - AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml index b95e968..d07ffea 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml @@ -93,16 +93,6 @@ AND re.DEV_CODE = #{devCode} - - - - AND re.TEMPERATURE 37.2 - - - AND re.TEMPERATURE ]]> 37.2 - - - AND re.DATETIME = ]]> #{beginTime} diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java index deed198..cd17ae7 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.shiro.ShiroUser; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.model.Dict; @@ -75,6 +76,14 @@ String deptName = permissionService.getDeptName(deptid); res.put("deptName",deptName); } + if(ToolUtil.isEmpty(list)){ + Map emptyResult = new HashMap<>(); + ShiroUser currentUser = permissionService.getCurrLoginUser(); + emptyResult.put("deptId",currentUser.getDeptId()); + emptyResult.put("deptName",currentUser.getDeptName()); + emptyResult.put("num",0); + list.add(emptyResult); + } return list; }