fix：“修复子商家设备数量不显示的问题”

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -338,7 +338,8 @@ public class TEquipmentController {
         Integer type = admin.getType();
         if (type < 2) {
             query.eq(TEquipment::getAdminId, 238);
-        } else {
+        }
+        if (type == 2) {
             query.eq(TEquipment::getAdminId, adminId);
         }
 
@@ -806,7 +807,8 @@ public class TEquipmentController {
         String equipmentId = param.getEquipmentId();
         String paramAdminId = param.getAdminId();
         TAdmin admin = tAdminService.getById(paramAdminId);
-        if (admin.getType() < 2) {
+        Integer type = admin.getType();
+        if (type < 2) {
             param.setAdminId(null);
         }
         // 公司平台
@@ -827,6 +829,19 @@ public class TEquipmentController {
             param.setAdminId(dminId);
             // 需要区分是否商家子账户
         }
+        // 如果是子账户商家
+        if (type == 3) {
+            // 查找属于这个子账户的设备
+            TAdminEquipment adminEquipment = tAdminEquipmentService.getById(paramAdminId);
+            if (!adminEquipment.getType().equals("0")) {
+                //全部机器
+//            } else {
+                String adminEquipmentIds = adminEquipment.getEquipmentIds();
+                List<String> equipmentIds = Arrays.asList(adminEquipmentIds.split(","));
+                param.setEquipmentIds(equipmentIds);
+            }
+            param.setAdminId(String.valueOf(admin.getParentId()));
+        }
         machineTotalNum = tEquipmentService.findMachineTotalNum(param);
         machineUseNum = tEquipmentService.findMachineUseNum(param);
         Map<String, String> map = new HashMap<>();

src/main/java/com/szwl/mapper/xml/TEquipmentMapper.xml

@@ -79,6 +79,12 @@
                 AND a.company_type = '1'
             </when>
         </choose>
+        <if test="equipmentIds != null and equipmentIds!=''">
+            AND a.id IN
+            <foreach item="item" index="index" collection="equipmentIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>
 
     <!-- 获取所有正在运营的机器数量-->
@@ -97,6 +103,12 @@
                 AND a.company_type = '1'
             </when>
         </choose>
+        <if test="equipmentIds != null and equipmentIds!=''">
+            AND a.id IN
+            <foreach item="item" index="index" collection="equipmentIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         and a.eqe_status='1'
     </select>
 

src/main/java/com/szwl/model/query/StatisticsParam.java

@@ -55,4 +55,7 @@ public class StatisticsParam {
 
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
+
+    @ApiModelProperty(value = "子账户管理机器列表")
+    private List<String> equipmentIds;
 }