部门树修改

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -1,6 +1,7 @@
 package com.ozs.service.utils;
 
 import com.alibaba.fastjson2.JSON;
+import com.ozs.common.utils.sign.Md5Utils;
 import com.ozs.service.entity.vo.Data;
 import com.ozs.service.entity.vo.Heartbeat;
 import com.ozs.service.entity.vo.UpdateDeviceSn;

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

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.entity.SysRole;
+import com.ozs.common.core.domain.vo.SysDeptVo;
 import com.ozs.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.ArrayUtils;
@@ -46,7 +47,7 @@ public class SysDeptController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept) {
+    public AjaxResult list(SysDeptVo dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         for (SysDept sysDept : depts) {
             for (SysDept dept1 : depts) {
@@ -74,7 +75,7 @@ public class SysDeptController extends BaseController {
      */
     @GetMapping("/deptTree")
     @ApiOperation("获取部门树列表")
-    public AjaxResult deptTree(SysDept dept) {
+    public AjaxResult deptTree(SysDeptVo dept) {
         return success(deptService.selectDeptTreeList(dept));
     }
 
@@ -84,7 +85,7 @@ public class SysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        List<SysDept> depts = deptService.selectDeptList(new SysDeptVo());
         depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
         return success(depts);
     }

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.core.domain.entity.SysMenu;
+import com.ozs.common.core.domain.vo.SysDeptVo;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
 import com.ozs.common.core.domain.vo.SysUserVo;
 import com.ozs.service.entity.BaseUser;
@@ -303,7 +304,7 @@ public class SysRoleController extends BaseController {
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
+        ajax.put("depts", deptService.selectDeptTreeList(new SysDeptVo()));
         return ajax;
     }
 }