|
|
|
@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.math.BigInteger;
|
|
|
|
@ -71,7 +72,11 @@ public class TerminalExtServiceImpl implements TerminalExtService {
|
|
|
|
|
View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
|
|
|
|
|
criteria.andIdIsNotNull().andTowerIdIsNotNull().andLineIdIsNotNull().andDyIdIsNotNull();
|
|
|
|
|
if (permit.getIsSuper().equals(CommonStatus.DELETE.value())) {
|
|
|
|
|
criteria.andIdIn(permit.getTermpList());
|
|
|
|
|
if (CollectionUtils.isEmpty(permit.getTermpList())) {
|
|
|
|
|
criteria.andIdEqualTo(-1);
|
|
|
|
|
} else {
|
|
|
|
|
criteria.andIdIn(permit.getTermpList());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (vo.getTowerId() != null && vo.getTowerId() > 0) {
|
|
|
|
|
criteria.andTowerIdEqualTo(vo.getTowerId());
|
|
|
|
|