bug修改

vehicle-admin/src/main/java/com/ozs/web/controller/system/MonitorSystemController.java

@@ -140,7 +140,7 @@ public class MonitorSystemController extends BaseController {
         for (Long id : ids) {
             monitorSystem.setId(id);
             if (UserConstants.EXCEPTION.equals(monitorSystemService.checkSystemOnline(monitorSystem))) {
-                return error("监测系统修改'" + monitorSystem.getClientId() + "'失败，该系统正在使用中，无法删除");
+                return error("监测系统删除'" + monitorSystem.getId() + "'失败，该系统正在使用中，无法删除");
             }   
         }
         monitorSystemService.deleteByIds(ids);

vehicle-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -155,6 +155,10 @@ public class SysUserController extends BaseController {
                 String name = stringBuilder.toString();
                 sysUser.setRoleName(name.substring(0, name.length() - 1));
             }
+            SysDept sysDept = deptService.selectDeptById(sysUser.getDeptId());
+            if (!ObjectUtils.isEmpty(sysDept)) {
+                sysUser.setDeptName(sysDept.getDeptName());
+            }
         }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
         util.exportExcel(response, usetList, "用户数据");