From 4d198cd78684d17c849b0bd7d323894009ca17f5 Mon Sep 17 00:00:00 2001
From: dhz <duhuizhe>
Date: 星期三, 22 六月 2022 09:59:44 +0800
Subject: [PATCH] 备件管理bug 修改
---
src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
index 78b028f..d521c39 100644
--- a/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
+++ b/src/cn/ksource/web/facade/customerconfig/slacustomer/SlaCustomerFacadeImpl.java
@@ -799,7 +799,7 @@
*/
@Override
public List<Map> getCiCategoryTree(String pid,String type) {
- String sql = " SELECT ID as id,PID as pid,NAME as name,LV as jb FROM CMDB_CI_CATEGORY WHERE STATE=1 ";
+ String sql = " SELECT ID as id,PID as pid,NAME as name,LV as jb,STATE,SERIAL FROM CMDB_CI_CATEGORY WHERE STATE=1 ";
SqlParameter param = new SqlParameter();
if(StringUtil.notEmpty(type)){
sql+=" and cate_type=:type";
@@ -815,13 +815,19 @@
}
if(StringUtil.isBlank(pid) && type.equals("2")){
sql="";
- sql="select DISTINCT LV1_ID as id,\"0\" as pid ,LV1_name as name,\"1\" as lv from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 ";
+ sql="select DISTINCT LV1_ID AS id,\n" +
+ " '0' AS pid ,\n" +
+ " LV1_name AS name,\n" +
+ " '1' AS lv,STATE,SERIAL from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 ";
}else if(StringUtil.isNotBlank(pid) && type.equals("2")){
CMDB_CI_CATEGORY cmdb_ci_category=new CMDB_CI_CATEGORY(pid).getInstanceById();
Integer lv=cmdb_ci_category.getLv();
if(lv==1){
sql="";
- sql="select DISTINCT LV2_ID as id,LV1_ID as pid ,LV2_name as name,\"2\" as lv from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 and LV1_ID=:pid ";
+ sql="select DISTINCT LV1_ID AS id,\n" +
+ " '0' AS pid ,\n" +
+ " LV1_name AS name,\n" +
+ " '1' AS lv,STATE,SERIAL from CMDB_CI_CATEGORY where STATE=1 and lv=3 and CATE_TYPE=2 and LV1_ID=:pid ";
param.addValue("pid", pid);
}
--
Gitblit v1.9.1