Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/dept/add/AddDeptService.java

     private void addRoadAndSectionToDept(String tenantId, String deptId, List<RoadSectionDto> roadSectionDtoList) {
         List<RoadInformation> roadInformationList = new ArrayList<>();
         List<Section> sectionList = new ArrayList<>();
-
         RoadInformation road;
         List<Section> sectionListTmp;
         for (RoadSectionDto roadSectionDto : roadSectionDtoList) {
             road = roadSectionDto.getRoad();
             sectionListTmp = roadSectionDto.getSectionList();
-
             roadInformationList.add(road);
             sectionList.addAll(sectionListTmp);
         }
         List<RoadDept> list = new ArrayList<>();
         RoadDept roadDept;
         for (RoadInformation roadInformation : roadInformationList) {
+            Integer count = roadDeptMapper.selectCount(new LambdaQueryWrapper<RoadDept>()
+                    .eq(RoadDept::getTenantId, tenantId)
+                    .eq(RoadDept::getDeptId, deptId)
+                    .eq(RoadDept::getRoadId, roadInformation.getId()));
+            if (count > 0) {
+                // 已经存在，不用在添加，防止出现冗余数据
+                continue;
+            }
             roadDept = new RoadDept();
             roadDept.setTenantId(tenantId);
             roadDept.setDeptId(deptId);
         List<SectionDept> list = new ArrayList<>();
         SectionDept sectionDept;
         for (Section section : sectionList) {
+            Integer count = sectionDeptMapper.selectCount(new LambdaQueryWrapper<SectionDept>()
+                    .eq(SectionDept::getTenantId, tenantId)
+                    .eq(SectionDept::getDeptId, deptId)
+                    .eq(SectionDept::getSectionId, section.getId()));
+            if (count > 0) {
+                // 已经存在，不用在添加，防止出现冗余数据
+                continue;
+            }
+
             sectionDept = new SectionDept();
             sectionDept.setTenantId(tenantId);
             sectionDept.setDeptId(deptId);

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/dept/query/QueryDeptInfoService.java

 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
         List<RoadSectionDto> roadSectionDtoList = new ArrayList<>();
         RoadSectionDto roadSectionDto;
         List<Section> sectionListTmp;
-        for (RoadInformation roadInformation : roadInformationList) {
+
+        Map<String, RoadInformation> roadInformationMap = roadInformationList.stream().collect(Collectors.toMap(RoadInformation::getId, Function.identity()));
+        RoadInformation roadInformation;
+        for (Section section : sectionList) {
             roadSectionDto = new RoadSectionDto();
             sectionListTmp = new ArrayList<>();
-            for (Section section : sectionList) {
-                if (section.getRoadId().equals(roadInformation.getId())) {
-                    sectionListTmp.add(section);
-                }
-            }
+            sectionListTmp.add(section);
+            roadInformation = roadInformationMap.get(section.getRoadId());
             roadSectionDto.setRoad(roadInformation);
             roadSectionDto.setSectionList(sectionListTmp);
             roadSectionDtoList.add(roadSectionDto);

tuoheng-service/tuoheng-admin/src/main/resources/mapper/StructureMapper.xml

         left JOIN th_section se ON sr.section_id=se.id
         left JOIN th_road rd ON sr.road_id=rd.id
         where sr.mark=1 and se.mark=1 and rd.mark=1
-        <if test="request.tenantId !=null abd request.tenantId !=''">
-            AND sr.tenant_id = #{request.tenantId}
-        </if>
         <if test="request.structureName !=null and request.structureName !=''">
             AND sr.`structure_name` like concat('%',#{request.structureName},'%')
         </if>