|
@@ -787,10 +787,14 @@ public class WbsTreeContractController extends BladeController {
|
|
Element tr1 = trElements1.get(i);
|
|
Element tr1 = trElements1.get(i);
|
|
Element tr2 = trElements2.get(i);
|
|
Element tr2 = trElements2.get(i);
|
|
//排除电签单元格
|
|
//排除电签单元格
|
|
- Elements tdElements1 = tr1.select("td:not([dqid])");
|
|
|
|
|
|
+ Elements tdElements1 = tr1.select("td");
|
|
Elements tdElements2 = tr2.select("td");
|
|
Elements tdElements2 = tr2.select("td");
|
|
for (int j = 0; j < tdElements1.size(); j++) {
|
|
for (int j = 0; j < tdElements1.size(); j++) {
|
|
Element td1 = tdElements1.get(j);
|
|
Element td1 = tdElements1.get(j);
|
|
|
|
+ // 检查td1是否包含dqid属性,如果包含则跳过
|
|
|
|
+ if (td1.attr("dqid").length() > 0) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
Element td2 = tdElements2.get(j);
|
|
Element td2 = tdElements2.get(j);
|
|
String keyName = getKeyNameFromChildElement(td1);
|
|
String keyName = getKeyNameFromChildElement(td1);
|
|
if (StringUtils.isNotEmpty(keyName)) {
|
|
if (StringUtils.isNotEmpty(keyName)) {
|