瀏覽代碼

报错修复

hu 8 月之前
父節點
當前提交
43d26ff8fd

+ 0 - 1
src/custom/restcontroller/sale/serviceorder/serviceorder.java

@@ -37,7 +37,6 @@ public class serviceorder extends Controller {
             if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
                 where.append(" and(");
                 where.append("t1.billno like'%").append(whereObject.getString("condition")).append("%' ");
-                where.append("or t3.sonum like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t1.reason like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");

+ 1 - 2
src/custom/restcontroller/webmanage/role/role.java

@@ -227,8 +227,7 @@ public class role extends Controller {
 //        SQLFactory appselectsql = new SQLFactory(this, "应用授权选择", pageSize, pageNumber, pageSorting);
 //        appselectsql.addParameter_SQL("where", where);
 //        Rows approws = dbConnect.runSqlQuery(appselectsql);
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_system", "systemname", "sa_projectid",
-                "advantage","inferiority","remarks","important");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_system", "systemname");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_systemclient", "t2", "t1.systemid = t2.systemid and t2.isused = 1","systemclientname");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_systemmodule", "t3", "t2.systemclientid = t3.systemclientid and t3.isused = 1","systemmodulename");

+ 1 - 1
src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -960,7 +960,7 @@ public class workorder extends Controller {
         }
 
         if(rows.get(0).getString("type").equals("安装")){
-            Rows itemrows =dbConnect.runSqlQuery("select t1.sku,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid from sa_serviceorderitems t1 inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid where t1.sa_serviceorderid="+rows.get(0).getLong("sa_serviceorderid")+" and t1.siteid='"+siteid+"' left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid");
+            Rows itemrows =dbConnect.runSqlQuery("select t1.sku,ifnull(t2.warrantyday,0) warrantyday,t4.sa_agentsid from sa_serviceorderitems t1 inner join plm_item t2 on t1.itemid=t2.itemid and t1.siteid=t2.siteid left join sa_serviceorder t3 on t1.sa_serviceorderid=t3.sa_serviceorderid and t1.siteid=t3.siteid left join sa_agents t4 on t3.sys_enterpriseid=t4.sys_enterpriseid and t3.siteid=t4.siteid where t1.sa_serviceorderid="+rows.get(0).getLong("sa_serviceorderid")+" and t1.siteid='"+siteid+"' ");
             if(itemrows.isNotEmpty()){
                 LocalDate now = LocalDate.now();