|
@@ -64,6 +64,8 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
ITmDepartmentService tmDepartmentService;
|
|
|
@Autowired
|
|
|
ITmUserService tmUserService;
|
|
|
+ @Autowired
|
|
|
+ ITmCameraService tmCameraService;
|
|
|
|
|
|
@Value("${upload.query-path}")
|
|
|
private String queryPath;
|
|
@@ -282,6 +284,9 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
|
|
|
String deptId = caseEntity.getDeptId();
|
|
|
wrapper.eq(Model::getDeptId,deptId);
|
|
|
}
|
|
|
+ if(StringUtils.isNotBlank(param.getDeptId())){
|
|
|
+ wrapper.eq(Model::getDeptId,param.getDeptId());
|
|
|
+ }
|
|
|
wrapper.in(Model::getDeptId,deptIds);
|
|
|
wrapper.eq(Model::getType,3);
|
|
|
wrapper.notIn(Model::getCreateStatus,-2);
|