|
@@ -306,17 +306,16 @@ public class TEquipmentController {
|
|
|
@GetMapping("/getClientIds")
|
|
|
public ResponseModel<List<String>> getClientIds(@RequestParam String adminId) {
|
|
|
//查找属于这个商家子账户的设备
|
|
|
- LambdaQueryWrapper<TEquipment> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(TEquipment::getAdminId,adminId);
|
|
|
- List<TEquipment> list = tEquipmentService.list(queryWrapper);
|
|
|
-// String equipmentIds = adminEquipment.getEquipmentIds();
|
|
|
+ TAdminEquipment adminEquipment = tAdminEquipmentService.getById(adminId);
|
|
|
+ String equipmentIds = adminEquipment.getEquipmentIds();
|
|
|
// 分割保存在设备ID保存在list
|
|
|
-// String[] tEquipmentIds = equipmentIds.split(",");
|
|
|
-// List<String> list = Arrays.asList(tEquipmentIds);
|
|
|
+ String[] tEquipmentIds = equipmentIds.split(",");
|
|
|
+ List<String> list = Arrays.asList(tEquipmentIds);
|
|
|
List<String> returnList = new ArrayList<>();
|
|
|
if (list.size() > 0) {
|
|
|
- for (TEquipment tEquipment : list) {
|
|
|
- returnList.add(tEquipment.getClientId());
|
|
|
+ for (String id : list) {
|
|
|
+ TEquipment equipment = tEquipmentService.getById(id);
|
|
|
+ returnList.add(equipment.getClientId());
|
|
|
}
|
|
|
}
|
|
|
return R.ok(returnList);
|