|
|
@@ -1006,7 +1006,7 @@ func (this *OilSupplierController) GetDictList() {
|
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
|
- dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
+ // dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
//获取我创建的所有公司
|
|
|
var list []supplier.OilSupplier
|
|
|
if this.User.IsCompanyUser == 1 {
|
|
|
@@ -1059,7 +1059,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
|
|
|
userSvc.GetEntityById(this.User.Id, &userEntity)
|
|
|
dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
|
|
|
dictList["GaodeMapChinaAreas"] = areaJsonSvc.GetGaodeMapChinaAreas()
|
|
|
- dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
+ // dictList["CountryList"] = areaJsonSvc.GetCountryList()
|
|
|
//获取我创建的所有公司
|
|
|
var list []supplier.OilSupplier
|
|
|
if this.User.IsCompanyUser == 1 {
|
|
|
@@ -1085,17 +1085,17 @@ func (this *OilSupplierController) GetDictListByStatus() {
|
|
|
//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
|
|
|
//users = rsvc.GetUserByRole(strconv.Itoa(auditWorkflow.RoleId), this.User.AccCode) //
|
|
|
where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + workflow.SECOND_TRIAL + "'"
|
|
|
- rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
|
|
|
+ rsvc.GetEntitysByWhere(OilAuditSettingName, where, &users)
|
|
|
dictList["Auditer"] = users
|
|
|
} else if status == suppliercert.SECOND_TRIAL_STATUS {
|
|
|
//rsvc.GetAuditStepRoleEntity(OilAuditSettingName, this.User.DepartmentId, workflow.SECOND_TRIAL, &auditWorkflow)
|
|
|
} else if status == suppliercert.THIRD_TRIAL_STATUS {
|
|
|
where := "OrganizeId=" + majorAduit + " and AuditStepCode='" + workflow.SECOND_TRIAL + "'"
|
|
|
- rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
|
|
|
+ rsvc.GetEntitysByWhere(OilAuditSettingName, where, &users)
|
|
|
dictList["Auditer"] = users
|
|
|
} else if status == suppliercert.PROF_AUDIT_STATUS {
|
|
|
where := "OrganizeId=" + this.User.DepartmentId + " and AuditStepCode='" + workflow.PROF_AUDIT + "'"
|
|
|
- rsvc.GetEntitysByWhere(OilAuditSettingName,where, &users)
|
|
|
+ rsvc.GetEntitysByWhere(OilAuditSettingName, where, &users)
|
|
|
dictList["Auditer"] = users
|
|
|
} else if status == suppliercert.CENT_AUDIT_STATUS {
|
|
|
|
|
|
@@ -1484,10 +1484,10 @@ func (this *OilSupplierController) GetAuditerByDept() {
|
|
|
|
|
|
var user []suppliercert.UserList
|
|
|
where := "OrganizeId=" + Id + " and AuditStepCode='" + auditstepcode + "'"
|
|
|
- rsvc.GetEntitysByWhere(OilAuditSettingName,where, &user)
|
|
|
+ rsvc.GetEntitysByWhere(OilAuditSettingName, where, &user)
|
|
|
|
|
|
var datainfo ErrorDataInfo
|
|
|
datainfo.Item = user
|
|
|
this.Data["json"] = &datainfo
|
|
|
this.ServeJSON()
|
|
|
-}
|
|
|
+}
|