|
@@ -83,7 +83,7 @@ public class FormulaDaoImpl implements IFormulaDao {
|
|
|
baseInfo.setConstructionUnitName(relation.getConstructionUnitName());
|
|
|
}
|
|
|
}else if(info.getContractType()==1){
|
|
|
- List<ContractInfo> list=getEntityList("select b.* from m_contract_relation_jlyz a join m_contract_info b on a.contract_id_jlyz=b.id where contract_id_sg ="+info.getId(),ContractInfo.class);
|
|
|
+ List<ContractInfo> list=getEntityList("select b.* from m_contract_relation_jlyz a join m_contract_info b on a.contract_id_jlyz=b.id where contract_id_sg ="+info.getId()+" and b.contract_type=2",ContractInfo.class);
|
|
|
if(list!=null&&list.size()>0){
|
|
|
ContractInfo relation=list.get(0);
|
|
|
/* baseInfo.setSupervisionUnitName(relation.getSupervisionUnitName());*/
|