|
@ -5671,8 +5671,11 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
|
|
|
ids +="'"+mediicinedevice.getEquNum()+"',";
|
|
|
}
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
String belongCommunitys = "";
|
|
|
String tempSql = "";
|
|
@ -5829,8 +5832,11 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
|
|
|
ids +="'"+mediicinedevice.getEquNum()+"',";
|
|
|
}
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
String belongCommunitys = "";
|
|
|
String tempSql = "";
|
|
@ -5953,8 +5959,11 @@ public class MedicinedeviceService extends BaseJpaService<Mediicinedevice, Medi
|
|
|
Mediicinedevice mediicinedevice = deviceDao.findOne(deviceIds.get(i));
|
|
|
ids +="'"+mediicinedevice.getEquNum()+"',";
|
|
|
}
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
if (org.apache.commons.lang3.StringUtils.isNoneBlank(ids)){
|
|
|
ids = ids.substring(0,ids.length()-1);
|
|
|
condition = " AND o.shipping_equ IN ("+ids+")";
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
String belongCommunitys = "";
|
|
|
String tempSql = "";
|