Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseFacilityTypeServiceImpl.java

@@ -40,7 +40,7 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
     public List<BaseGgpFacilityTypeVO> typeInfo() {
         List<BaseGgpFacilityTypeVO> list = new ArrayList<>();
         LambdaQueryWrapper<BaseFacilityType> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(BaseFacilityType::getTenantId, 1);
+//        queryWrapper.eq(BaseFacilityType::getTenantId, 1);
         List<BaseFacilityType> list1 = this.list(queryWrapper);
         Integer typeNum = baseMapper.selectCount(queryWrapper);
         if (CollectionUtils.isNotEmpty(list1)) {
@@ -62,7 +62,7 @@ public class BaseFacilityTypeServiceImpl extends AbstractCrudService<BaseFacilit
                 list4 = baseMapper.typeUpkeepNumList(1);
                 list5 = baseMapper.typeCloseNumList(1);
                 LambdaQueryWrapper<BaseGgpFacility> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.eq(BaseGgpFacility::getTenantId, 1);
+//                queryWrapper1.eq(BaseGgpFacility::getTenantId, 1);
                 facilityNum = baseGgpFacilityService.getBaseMapper().selectCount(queryWrapper1);
                 baseGgpFacilityTypeVO.setFacilityNum(facilityNum);
             }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseGgpFacilityServiceImpl.java

@@ -86,7 +86,8 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
             userType = loginUser.getUserType();
         }
         LambdaQueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
+        queryWrapper
+//                .eq(BaseGgpFacility::getTenantId, SecurityUtils.getTenantId())
                 .like(StringUtils.isNotBlank(exRequest.getFacilityName()), BaseGgpFacility::getFacilityName, exRequest.getFacilityName())
                 .eq(StringUtils.isNotBlank(exRequest.getFacilityNum()), BaseGgpFacility::getFacilityNum, exRequest.getFacilityNum())
                 .eq(null != exRequest.getFacilityType(),BaseGgpFacility::getFacilityType,exRequest.getFacilityType())

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseFacilityTypeMapper.xml

@@ -24,11 +24,11 @@
         typeFacilityNum
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
-        <where>
-            <if test="tenantId != null and tenantId != ''">
-                and d.tenant_id = #{tenantId}
-            </if>
-        </where>
+<!--        <where>-->
+<!--            <if test="tenantId != null and tenantId != ''">-->
+<!--                and d.tenant_id = #{tenantId}-->
+<!--            </if>-->
+<!--        </where>-->
         GROUP BY d.id
     </select>
     <select id="typeNormalNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
@@ -37,9 +37,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-            <if test="tenantId != null and tenantId != ''">
-                and d.tenant_id = #{tenantId}
-            </if>
+<!--            <if test="tenantId != null and tenantId != ''">-->
+<!--                and d.tenant_id = #{tenantId}-->
+<!--            </if>-->
                 and e.status = 0
         </where>
         GROUP BY d.id
@@ -50,9 +50,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-            <if test="tenantId != null and tenantId != ''">
-                and d.tenant_id = #{tenantId}
-            </if>
+<!--            <if test="tenantId != null and tenantId != ''">-->
+<!--                and d.tenant_id = #{tenantId}-->
+<!--            </if>-->
             and e.status = 1
         </where>
         GROUP BY d.id
@@ -63,9 +63,9 @@
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.id
         <where>
-            <if test="tenantId != null and tenantId != ''">
-                and d.tenant_id = #{tenantId}
-            </if>
+<!--            <if test="tenantId != null and tenantId != ''">-->
+<!--                and d.tenant_id = #{tenantId}-->
+<!--            </if>-->
             and e.status = 2
         </where>
         GROUP BY d.id