|
|
|
@ -663,8 +663,8 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat |
|
|
|
for (int i = 0; i < whereConditionArr.length; i++) { |
|
|
|
if (whereConditionArr[i].contains("create_by")) { |
|
|
|
String formula = filteredList.get(i).getFormula(); |
|
|
|
// whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))"; |
|
|
|
whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))"; |
|
|
|
whereConditionArr[i] = "vpp.bu_no " + createBySymbol + " (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))"; |
|
|
|
// whereConditionArr[i] = "vpp.bu_no in (select bu_No from dbo.Get_Now_BU_chooseAble(a.site, '"+ formula +"'))"; |
|
|
|
} |
|
|
|
} |
|
|
|
whereClause = String.join(" AND ", whereConditionArr); |
|
|
|
@ -675,7 +675,7 @@ public class ProofingInformationServiceImpl extends ServiceImpl<ProofingInformat |
|
|
|
params.put("menuId", data.getMenuId()); |
|
|
|
params.put("whereClause", whereClause); |
|
|
|
params.put("orderClause", orderClause); |
|
|
|
IPage<ProofingInformationVo> resultList = proofingInformationMapper.testInformationSearchByAnyField(new Page<ProofingInformationVo>(data.getNo(), data.getSize()), params); |
|
|
|
IPage<ProofingInformationVo> resultList = proofingInformationMapper.proofingInformationSearchByAnyField(new Page<ProofingInformationVo>(data.getNo(), data.getSize()), params); |
|
|
|
return new PageUtils(resultList); |
|
|
|
} |
|
|
|
|
|
|
|
|