From 46adcbf7494340a495539708210bb39110bdc33b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 29 十一月 2025 17:35:03 +0800
Subject: [PATCH] 快速登记、化验及称重作业页面提交1

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
index bc994f1..034c6b7 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DeviceSerService.java
@@ -35,6 +35,15 @@
      *
      * @return
      */
+    public List<DeviceSer> getAllSerByCompanyId(String companyId) {
+        return deviceSerRepository.getAllSerByCompanyId(companyId);
+    }
+
+    /**
+     * JPA 鏌ヨ鍒嗘満鍒楄〃
+     *
+     * @return
+     */
     public List<DeviceSer> getAllSer() {
         SysUser user = ContextUtil.getLoginUser();
         SysDept userDept = iSysDeptService.selectDeptById(user.getDeptId());
@@ -43,7 +52,6 @@
         }else {
             return deviceSerRepository.getDataByParentId(user.getDeptId() + "%");
         }
-
     }
 
     /**
@@ -172,7 +180,7 @@
         if (StringUtils.isEmpty(companyId)) {
             companyId = ContextUtil.getCompanyId();
         }
-        List<DeviceSer> list = this.getAllSer();
+        List<DeviceSer> list = this.getAllSerByCompanyId(companyId);
         this.setCacheSer(list, companyId);
     }
 

--
Gitblit v1.9.3