文档管理-bug修复

controllers/document_manage/document_manage_controller.go

@@ -295,7 +295,7 @@ func (this *DocumentManageController) DocumentSave() {
 	}
 
 	req.SysUserId = sysUser.AdminId
-	req.SysUserName = sysUser.AdminName
+	req.SysUserName = sysUser.RealName
 	err := document_manage_service.DocumentSave(req)
 	if err != nil {
 		br.Msg = "保存文档失败"

models/classify.go

@@ -588,7 +588,7 @@ func GetClassifyListByIdList(classifyIdList []int) (items []*Classify, err error
 // GetClassifyListByParentId 查询父分类下所有的子分类
 func GetClassifyListByParentId(parentId int) (items []*Classify, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT * FROM classify WHERE parent_id = ? `
+	sql := `SELECT * FROM classify WHERE parent_id = ? and enabled = 1`
 
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 

services/document_manage_service/document_manage_service.go

@@ -68,6 +68,7 @@ func DocumentVarietyList() ([]models.ChartPermissionVO, error) {
 
 	condition = ` and enabled=?`
 	pars = append(pars, 1)
+	condition += ` and product_id=1`
 
 	chartPermissionList, err := cp.GetItemsByCondition(condition, pars)
 	if err != nil {
@@ -81,6 +82,7 @@ func DocumentVarietyList() ([]models.ChartPermissionVO, error) {
 			permissionVO := models.ChartPermissionVO{
 				ChartPermissionId:   chartPermission.ChartPermissionId,
 				ChartPermissionName: chartPermission.ChartPermissionName,
+				PermissionName:      chartPermission.PermissionName,
 				ParentId:            chartPermission.ParentId,
 				Enabled:             chartPermission.Enabled,
 				Sort:                chartPermission.Sort,
@@ -223,7 +225,7 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird int, key
 		pars = append(pars, classifyIdThird)
 	}
 	if keyword != "" {
-		condition += ` and a.title like ? or a.admin_real_name like ?`
+		condition += ` and ( a.title like ? or a.admin_real_name like ? ) `
 		pars = append(pars, "%"+keyword+"%", "%"+keyword+"%")
 	}
 
@@ -254,6 +256,10 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird int, key
 	if err != nil {
 		return nil, err
 	}
+	for _, report := range reportList {
+		// 格式换时间格式
+		report.ModifyTime = report.ModifyTime.UTC()
+	}
 
 	reportPage.Paging = page
 	reportPage.List = reportList