电子信息牌修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -1356,8 +1356,9 @@ public class LabSubjectManagerService {
                 labSensors = sensorMapper.selectSensorBySubIds(longs);
             }
             //2.1.获取详细地址后面做(已完成)
-            Long[] layoutIds = labSubjects.stream().map(a -> a.getLayoutId()).filter(a -> a != null).toArray(Long[]::new);
-            List<SubAddrr> subAddrrs = subjectLayoutService.selectAddrrByLayoutIdsByPc(layoutIds);
+//            Long[] layoutIds = labSubjects.stream().map(a -> a.getLayoutId()).filter(a -> a != null).toArray(Long[]::new);
+            Long[] subIds = labSubjects.stream().map(a -> a.getId()).toArray(Long[]::new);
+            List<SubAddrr> subAddrrs = subjectLayoutService.selectAddrrByLayoutIdsByPc(subIds);
             Map<Long, SubAddrr> subAddrrMap = subAddrrs.stream().collect(Collectors.toMap(SubAddrr::getId, Function.identity()));
             //3.获取实验室是否拥有数据权限
             //3 获取实验室数据权限（杨森的需求：仅负责人时不能修改实验室） 后面做(已完成)
@@ -1424,7 +1425,7 @@ public class LabSubjectManagerService {
                 //需求变化， 危险等级不再和危险品关联，直接和实验室关联
 
                 //设置地址信息 后面做(已完成)
-                scVO.setSubAddrr(subAddrrMap.get(a.getLayoutId()));
+                scVO.setSubAddrr(subAddrrMap.get(a.getId()));
                 if (flag) {
                     scVO.setAdmin(Boolean.FALSE);
                     //实验权限覆盖 后面做(已完成)

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectLayoutMapper.xml

@@ -172,7 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id,  t.room, t.floor_id,
         lb.name as floor_name ,
         sd.dept_name as build_name
-        from lab_subject_layout as t
+        from lab_subject as t
         left join lab_building lb on lb.id = t.floor_id
         left join sys_dept sd on sd.dept_id = lb.dept_id
         where t.id in

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -220,7 +220,7 @@
         select t.id,
                t.name,
                bfl.floor_id,
-               lb.room,
+               t.room,
                t.dept_id,
                IFNULL(su.user_id, -1)                                                     admin_id,
                t.is_del,
@@ -271,7 +271,6 @@
         from lab_subject t
                  left join sys_user su on su.user_id = t.admin_id AND su.`del_flag` = 0
                  left join sys_dept sd on sd.dept_id = t.dept_id
-                 left join lab_subject_layout lb on lb.id = t.layout_id
                  left join lab_safe_classified cf on cf.id = t.level
                  LEFT JOIN lab_build_floor_layout bfl ON t.`id` = bfl.`sub_id`
     </sql>