jagzwxm/ja_manage.git

jagzwxm / ja_manage

吉安感知网项目-后端

summary
reflog
commits
tree
docs
forks
compare

Merge remote-tracking branch 'origin/master'

linwei

2026-02-11 dbc7e62be76ff48b26461ffaef9c3fc87be018cb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -171,7 +171,7 @@
      if (!AuthUtil.isAdministrator()) {
         deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      }
      return baseMapper.getDeviceManufacturerStatistics(deptList);
      return baseMapper.getDeviceManufacturerStatistics(deptList, AuthUtil.getDeptId());
   }

   /**

			@@ -171,7 +171,7 @@
			if (!AuthUtil.isAdministrator()) {
			deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
			}
			return baseMapper.getDeviceManufacturerStatistics(deptList);
			return baseMapper.getDeviceManufacturerStatistics(deptList, AuthUtil.getDeptId());
			}

			/**