xg

src/front/mark.go

@@ -19,6 +19,7 @@ func (f *Front) JyMarkList() {
 		limit, _ := f.GetInteger("length")
 		draw, _ := f.GetInteger("draw")
 		sourceInfo := f.GetString("s_sourceinfo") //数据源表
+		istag := f.GetString("b_istag")           //
 		field := f.GetString("field")             //字段
 		dataType := f.GetString("datatype")       //信息类型
 		min := f.GetString("minval")              //min max不用int类型接收，以免有默认值0
@@ -26,10 +27,14 @@ func (f *Front) JyMarkList() {
 		hasno, _ := f.GetBool("hasno")   //是否存在
 		notag, _ := f.GetBool("notag")   //是否标注
 		query := map[string]interface{}{ //剑鱼自用的标注页面，数据排除已分发已标注数据
-			"b_istag":       false,
 			"b_isgivegroup": false,
 			"b_isgiveuser":  false,
 		}
+		if istag == "true" {
+			query["b_istag"] = true
+		} else if istag == "false" {
+			query["b_istag"] = false
+		}
 		if stype == "notag" { //查询达标
 			query["b_istagging"] = false
 		} else if stype == "tag" { //查询未达标
@@ -108,7 +113,8 @@ func (f *Front) JyUserDataMark() {
 	user := f.GetSession("user").(map[string]interface{})
 	username := qu.ObjToString(user["s_login"]) //当前登录用户
 	groupId := qu.ObjToString(user["s_groupid"])
-	userId := qu.ObjToString(user["id"]) //当前登录用户标识
+	userId := qu.ObjToString(user["id"])       //当前登录用户标识
+	userRole := qu.ObjToString(user["i_role"]) //当前登录用户权限
 	obj := []map[string]interface{}{}
 	infoId := f.GetString("s_infoid")
 	sourceInfo := f.GetString("s_sourceinfo")
@@ -248,7 +254,7 @@ func (f *Front) JyUserDataMark() {
 	*/
 	//3、保存标注日志
 	project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, pid, map[string]interface{}{"s_name": 1})
-	b := SaveLog(infoId, "", username, userId, qu.ObjToString((*project)["s_name"]), "标注", baseInfo, allTagFields)
+	b := SaveLog(infoId, "", username, userId, userRole, qu.ObjToString((*project)["s_name"]), "标注", baseInfo, allTagFields)
 	qu.Debug("Save Log：", b)
 	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 }
@@ -261,7 +267,9 @@ func (f *Front) UserDataMark() {
 	msg := ""
 	user := f.GetSession("user").(map[string]interface{})
 	username := qu.ObjToString(user["s_login"]) //当前登录用户
-	userid := qu.ObjToString(user["id"])        //当前登录用户标识
+	userId := qu.ObjToString(user["id"])        //当前登录用户标识
+	userRole := qu.ObjToString(user["i_role"])  //当前登录用户权限
+
 	obj := []map[string]interface{}{}
 	infoId := f.GetString("s_infoid")
 	userTaskId := f.GetString("s_usertaskid")
@@ -411,7 +419,7 @@ func (f *Front) UserDataMark() {
 	}, false, false)
 	qu.Debug("Update UserTask：", b)
 	//4、保存标注日志
-	b = SaveLog(infoId, userTaskId, username, userid, qu.ObjToString((*userTask)["s_projectname"]), "标注", baseInfo, allTagFields)
+	b = SaveLog(infoId, userTaskId, username, userId, userRole, qu.ObjToString((*userTask)["s_projectname"]), "标注", baseInfo, allTagFields)
 	qu.Debug("Save Log：", b)
 	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 }
@@ -751,7 +759,7 @@ func MarkOther(content []interface{}, tagSet, baseSet, baseUnset map[string]inte
 }
 
 // SaveLog 标注日志保存
-func SaveLog(s_infoid, s_usertaskid, username, userid, projectname, s_stype string, baseInfo, allTagFields map[string]interface{}) (success bool) {
+func SaveLog(s_infoid, s_usertaskid, username, userid, role, projectname, s_stype string, baseInfo, allTagFields map[string]interface{}) (success bool) {
 	defer qu.Debug()
 	v_before := map[string]interface{}{}
 	for f, v := range allTagFields {
@@ -766,6 +774,7 @@ func SaveLog(s_infoid, s_usertaskid, username, userid, projectname, s_stype stri
 		"s_infoid":      s_infoid,
 		"s_stype":       s_stype,
 		"s_userid":      userid,
+		"s_role":        role,
 		"s_username":    username,
 		"i_createtime":  time.Now().Unix(),
 		"v_before":      v_before,

src/front/remark.go

@@ -691,6 +691,7 @@ func (f *Front) CheckSave() {
 	user := f.GetSession("user").(map[string]interface{})
 	username := qu.ObjToString(user["s_login"]) //当前登录用户
 	userId := qu.ObjToString(user["id"])        //当前登录用户标识
+	userRole := qu.ObjToString(user["i_role"])  //当前登录用户权限
 	var obj []map[string]interface{}
 	infoId := f.GetString("s_infoid")
 	sourceInfo := f.GetString("s_sourceinfo")
@@ -826,7 +827,7 @@ func (f *Front) CheckSave() {
 		qu.Debug("Update Marked：", b)
 	}
 	//3、保存标注日志
-	b := SaveLog(infoId, "", username, userId, qu.ObjToString((*project)["s_name"]), "质检", baseInfo, allTagFields)
+	b := SaveLog(infoId, "", username, userId, userRole, qu.ObjToString((*project)["s_name"]), "质检", baseInfo, allTagFields)
 	qu.Debug("Save Log：", b)
 	f.ServeJson(map[string]interface{}{"success": success, "msg": msg})
 }