Merge branch 'dev1.0' of http://192.168.3.207:10080/qmx/datatag into dev1.0

src/service/private_service.go

@@ -45,9 +45,7 @@ func (f *Private) Keydatademo(world string) {
 		if time.Now().Sub(time.Unix(ctimeint, 0)).Hours()/24 < Subday {
 			var tagfield *map[string]interface{}
 			if typeStr == "private" {
-				tagfield, _ = Mgo.FindOneByField("cuserdepartrule", bson.M{"s_dataid": world}, bson.M{"i_extfieldstype": 1, "i_estotal": 1, "s_userid": 1})
-				customer, _ := Mgo.FindById("cuser", qu.ObjToString((*tagfield)["s_userid"]), bson.M{"s_name": 1})
-				(*tagfield)["s_customer"] = (*customer)["s_name"]
+				tagfield, _ = Mgo.FindOneByField("tags", bson.M{"s_dataid": world}, bson.M{"i_extfieldstype": 1, "i_estotal": 1, "s_customer": 1})
 			}else {
 				tagfield, _ = Mgo.FindOneByField("tags_common", bson.M{"s_dataid": world}, bson.M{"i_extfieldstype": 1, "i_estotal": 1, "s_customer": 1})
 			}

src/service/repair_service.go

@@ -572,7 +572,7 @@ func ModifyData(tmp map[string]interface{}, user map[string]interface{}) (err ma
 		}else {
 			new_data[k] = v
 		}
-		modifyinfo[k] = true
+		modifyinfo[k] = "剑鱼维护"
 	}
 	//变更字段
 	if new_data["modifyinfo"] != nil {
@@ -661,6 +661,7 @@ func ModifyData(tmp map[string]interface{}, user map[string]interface{}) (err ma
 		"o_newinfo":      new_data,
 		"modifyinfo": 	  modifyinfo,
 	}
+	qu.Debug(log_data)
 	Mgo.Save(JyRecord, log_data)
 	return nil
 }

src/web/templates/repair/jy_bulk.html

@@ -143,7 +143,6 @@
             "searching": false,
             "ordering": false,
             "info": true,
-            "scrollY": true,
             "autoWidth": false,
             "language": {
                 "url": "/dist/js/dataTables.chinese.lang"

src/web/templates/repair/jy_edit.html

@@ -129,12 +129,12 @@
         for (let editDataKey in edit_data) {
             if (typeof edit_data[editDataKey] == "object") {
                 if (JSON.stringify(data[editDataKey]) != JSON.stringify(edit_data[editDataKey])) {
-                    modifyinfo[editDataKey] = true
+                    modifyinfo[editDataKey] = "剑鱼维护"
                     updata[editDataKey] = data[editDataKey]
                 }
             }else {
                 if (data[editDataKey] != edit_data[editDataKey]) {
-                    modifyinfo[editDataKey] = true
+                    modifyinfo[editDataKey] = "剑鱼维护"
                     updata[editDataKey] = data[editDataKey]
 
                 }
@@ -143,21 +143,21 @@
         //新增
         for (let dataKey in data) {
             if (edit_data[dataKey] == undefined) {
-                modifyinfo[dataKey] = true
+                modifyinfo[dataKey] = "剑鱼维护"
                 updata[dataKey] = data[dataKey]
             }
         }
         if (edit_detail != tmp_detail) {
-            modifyinfo["detail"] = true
+            modifyinfo["detail"] = "剑鱼维护"
             updata["detail"] = tmp_detail
         }
         if (edit_contentHtml != tmp_content) {
-            modifyinfo["contenthtml"] = true
+            modifyinfo["contenthtml"] = "剑鱼维护"
             updata["contenthtml"] = tmp_content
         }
         var tmp_summary = $('#summary').val();
         if (edit_summary != tmp_summary) {
-            modifyinfo["summary"] = true
+            modifyinfo["summary"] = "剑鱼维护"
             updata["summary"] = tmp_summary
         }