Commit ce8223ba by yangyang

主题研判、点位校验优化(标准)

parent 7489d309
...@@ -41,7 +41,7 @@ public class ZtypController { ...@@ -41,7 +41,7 @@ public class ZtypController {
model.setPage((model.getPage() - 1) * model.getLimit()); model.setPage((model.getPage() - 1) * model.getLimit());
model.setLimit(model.getLimit()); model.setLimit(model.getLimit());
int total = ztypService.getZpajxxTotal(model); int total = ztypService.getZpajxxTotal(model);
List<ZpajxxEntity> list = null; List<ZpajxxEntity> list = new ArrayList<>();
if(total>0){ if(total>0){
list = ztypService.getZpajxx(model); list = ztypService.getZpajxx(model);
} }
......
...@@ -806,7 +806,7 @@ public class ZtypServiceImpl implements ZtypService { ...@@ -806,7 +806,7 @@ public class ZtypServiceImpl implements ZtypService {
node1.setLabel(root.getName()); node1.setLabel(root.getName());
KsjResultPojo.Nodes.Properties properties = new KsjResultPojo.Nodes.Properties(); KsjResultPojo.Nodes.Properties properties = new KsjResultPojo.Nodes.Properties();
BeanUtils.copyProperties(node1, properties); BeanUtils.copyProperties(node1, properties);
properties.setBoderColor("");// 高亮 properties.setBoderColor("#FA0505");// 高亮
properties.setImgType(root.getType());// 图标 properties.setImgType(root.getType());// 图标
node1.setProperties(properties); node1.setProperties(properties);
nodes.add(node1); nodes.add(node1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment