|
@@ -2,7 +2,6 @@ package controllers
|
|
|
|
|
|
|
|
import (
|
|
import (
|
|
|
"eta/eta_mobile/models"
|
|
"eta/eta_mobile/models"
|
|
|
- "eta/eta_mobile/models/company"
|
|
|
|
|
"eta/eta_mobile/models/system"
|
|
"eta/eta_mobile/models/system"
|
|
|
"eta/eta_mobile/utils"
|
|
"eta/eta_mobile/utils"
|
|
|
)
|
|
)
|
|
@@ -107,18 +106,18 @@ func (this *SysRoleController) SystemConfig() {
|
|
|
}
|
|
}
|
|
|
list = append(list, osc)
|
|
list = append(list, osc)
|
|
|
|
|
|
|
|
- // 获取审批流设置
|
|
|
|
|
- confKey := "approval_flow"
|
|
|
|
|
- confTmp, e := company.GetConfigDetailByCode(confKey)
|
|
|
|
|
- if e != nil {
|
|
|
|
|
- br.Msg = "获取审批流配置失败"
|
|
|
|
|
- br.ErrMsg = "获取审批流配置失败, Err: " + e.Error()
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
- list = append(list, system.BusinessConf{
|
|
|
|
|
- ConfKey: "ApprovalFlow",
|
|
|
|
|
- ConfVal: confTmp.ConfigValue,
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ //// 获取审批流设置
|
|
|
|
|
+ //confKey := "approval_flow"
|
|
|
|
|
+ //confTmp, e := company.GetConfigDetailByCode(confKey)
|
|
|
|
|
+ //if e != nil {
|
|
|
|
|
+ // br.Msg = "获取审批流配置失败"
|
|
|
|
|
+ // br.ErrMsg = "获取审批流配置失败, Err: " + e.Error()
|
|
|
|
|
+ // return
|
|
|
|
|
+ //}
|
|
|
|
|
+ //list = append(list, system.BusinessConf{
|
|
|
|
|
+ // ConfKey: "ApprovalFlow",
|
|
|
|
|
+ // ConfVal: confTmp.ConfigValue,
|
|
|
|
|
+ //})
|
|
|
|
|
|
|
|
br.Data = list
|
|
br.Data = list
|
|
|
br.Ret = 200
|
|
br.Ret = 200
|
zwxi