|
@@ -2,6 +2,7 @@ package oilsupplier
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"dashoo.cn/backend/api/business/workflow"
|
|
"dashoo.cn/backend/api/business/workflow"
|
|
|
|
|
+ "dashoo.cn/business2/areajson"
|
|
|
"dashoo.cn/business2/items"
|
|
"dashoo.cn/business2/items"
|
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
"strconv"
|
|
"strconv"
|
|
@@ -966,11 +967,14 @@ func (this *OilSupplierController) GetDictList() {
|
|
|
dictList := make(map[string]interface{})
|
|
dictList := make(map[string]interface{})
|
|
|
dictSvc := items.GetItemsService(utils.DBE)
|
|
dictSvc := items.GetItemsService(utils.DBE)
|
|
|
userSvc := baseUser.GetBaseUserService(utils.DBE)
|
|
userSvc := baseUser.GetBaseUserService(utils.DBE)
|
|
|
|
|
+ areaJsonSvc := areajson.GetAreaJsonService(utils.DBE)
|
|
|
//customerSvc := svccustomer.GetCustomerService(utils.DBE)
|
|
//customerSvc := svccustomer.GetCustomerService(utils.DBE)
|
|
|
dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
|
|
dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
|
|
|
var userEntity userRole.Base_User
|
|
var userEntity userRole.Base_User
|
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
|
|
|
+ dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//var dictCustomer []svccustomer.Customer
|
|
//var dictCustomer []svccustomer.Customer
|
|
|
//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
|
|
//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
|