|
@@ -66,7 +66,7 @@ func (f *Front) ProjectSave() {
|
|
|
importDataNum := 0 //查询数量
|
|
|
var s_rulename []string //规则
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
- username := qu.ObjToString(user["s_name"]) //当前登录用户
|
|
|
+ username := qu.ObjToString(user["s_login"]) //当前登录用户
|
|
|
stype := f.GetString("s_type") //新建项目类型:数据库导入、excel导入
|
|
|
s_sourceinfoTmp := f.GetString("s_sourceinfo") //数据表
|
|
|
s_sourceinfo := "f_sourceinfo_" + s_sourceinfoTmp
|
|
@@ -313,8 +313,8 @@ func (f *Front) ProjectTaskSave() {
|
|
|
success := false
|
|
|
msg := ""
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
- username := qu.ObjToString(user["s_name"]) //当前登录用户
|
|
|
- projectid := f.GetString("s_projectid") //项目标识
|
|
|
+ username := qu.ObjToString(user["s_login"]) //当前登录用户
|
|
|
+ projectid := f.GetString("s_projectid") //项目标识
|
|
|
project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, projectid, nil)
|
|
|
projectname := qu.ObjToString((*project)["s_name"]) //项目名称
|
|
|
sourceinfo := qu.ObjToString((*project)["s_sourceinfo"]) //源数据表
|
|
@@ -416,7 +416,7 @@ func (f *Front) ProjectTaskRepulse() {
|
|
|
success := false
|
|
|
msg := ""
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
- username := qu.ObjToString(user["s_name"])
|
|
|
+ username := qu.ObjToString(user["s_login"])
|
|
|
status := f.GetString("s_status")
|
|
|
taskId := f.GetString("id")
|
|
|
groupId := f.GetString("s_groupid")
|
|
@@ -474,7 +474,7 @@ func (f *Front) ProjectTaskRetrieve() {
|
|
|
msg := ""
|
|
|
num := 0
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
- username := qu.ObjToString(user["s_name"])
|
|
|
+ username := qu.ObjToString(user["s_login"])
|
|
|
status := f.GetString("s_status")
|
|
|
taskId := f.GetString("id")
|
|
|
groupId := f.GetString("s_groupid")
|
|
@@ -548,7 +548,7 @@ func (f *Front) ProjectTaskClose() {
|
|
|
defer qu.Catch()
|
|
|
success := false
|
|
|
user := f.GetSession("user").(map[string]interface{})
|
|
|
- username := qu.ObjToString(user["s_name"])
|
|
|
+ username := qu.ObjToString(user["s_login"])
|
|
|
status := f.GetString("s_status")
|
|
|
taskId := f.GetString("id")
|
|
|
if status == "已完成" {
|