瀏覽代碼

搜索树

huangjn 3 年之前
父節點
當前提交
b463e1cb55

+ 1 - 1
blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -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");