Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -318,7 +318,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     public List<BaseCameraManagement> cameraAllList(BaseCameraManagement baseCameraManagement) {
         LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
-            wrapper.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
+            wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
             wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -96,7 +96,7 @@ public class SysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId) {
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         SysDept dept = deptService.selectDeptById(deptId);
         dept.setParentName(deptService.selectDeptById(dept.getParentId()).getDeptName());
         return success(dept);
@@ -133,7 +133,7 @@ public class SysDeptController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept) {
         Long deptId = dept.getDeptId();
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         } else if (dept.getParentId().equals(deptId)) {
@@ -167,7 +167,7 @@ public class SysDeptController extends BaseController {
         if (deptService.checkDeptExistUser(deptId)) {
             return warn("部门存在用户,不允许删除");
         }
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }