shenjingwei 1 месяц назад
Родитель
Сommit
eb6d36013a

+ 1 - 1
pom.xml

@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.yunlian.yos</groupId>
             <artifactId>yos-core</artifactId>
-            <version>3.4.26</version>
+            <version>3.4.27</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>

+ 2 - 1
src/custom/restcontroller/webmanage/saletool/orderclue/orderclue.java

@@ -7,6 +7,7 @@ import common.Controller;
 import common.YosException;
 import common.annotation.API;
 import common.data.*;
+import common.data.db.DBConnect;
 import common.data.db.SQLList;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.usermodel.*;
@@ -492,7 +493,7 @@ public class orderclue extends Controller {
             Rows agentAreaRows = querySQL.query();
 
 
-            QuerySQL enterprise_hridQuery = SQLFactory.createQuerySQL(this, "sys_enterprise_hr", "sys_enterprise_hrid");
+            QuerySQL enterprise_hridQuery = SQLFactory.createQuerySQL(this, "sys_enterprise_hr", "sys_enterpriseid", "sys_enterprise_hrid");
             enterprise_hridQuery.setWhere("isleader", true);
             enterprise_hridQuery.setWhere("sys_enterpriseid", agentAreaRows.toArrayList("sys_enterpriseid"));
             RowsMap enterprise_hridMap = enterprise_hridQuery.query().toRowsMap("sys_enterpriseid");

+ 1 - 1
src/custom/restcontroller/webmanage/saletool/orderclue/ordercluerule.java

@@ -44,7 +44,7 @@ public class ordercluerule extends Controller {
         for (Row row : rowsdetail) {
             long sys_enterpriseid = row.getLong("sys_enterpriseid");
             if (rowsMap.containsKey(String.valueOf(sys_enterpriseid))) {
-                row.put("areaname", rowsMap.get(String.valueOf(sys_enterpriseid)).get(0).getLong("areaname"));
+                row.put("areaname", rowsMap.get(String.valueOf(sys_enterpriseid)).get(0).getString("areaname"));
             } else {
                 row.put("areaname", "");
             }