|
@@ -1426,7 +1426,7 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
while (iterator.hasNext()) {
|
|
|
QueryProcessDataVO query = iterator.next();
|
|
|
if(StringUtils.isNotEmpty(query.getAncestors()) && StringUtils.isNotEmpty(String.valueOf(vos.getId()))){
|
|
|
- if(query.getAncestors().contains(vos.getId().toString()) || query.getAncestors().startsWith(vos.getParentId() + ",") || query.getTreeId().equals(vos.getId().toString())){
|
|
|
+ if(query.getAncestors().contains(vos.getId().toString()) || query.getAncestors().contains(vos.getPrimaryKeyId()) || query.getAncestors().startsWith(vos.getParentId() + ",") || query.getTreeId().equals(vos.getId().toString()) || query.getTreeId().equals(vos.getPrimaryKeyId())){
|
|
|
//如果为空,说明未填报
|
|
|
if(query.getStatus() == null || query.getStatus() == -1){
|
|
|
colorStatusValue.append("1");
|