|
@@ -129,12 +129,17 @@ func GetExcelInfoAll() (items []*ExcelClassifyItems, err error) {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func GetNoContentExcelInfoAll(source int) (items []*ExcelClassifyItems, err error) {
|
|
|
+func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
|
|
|
o := orm.NewOrmUsingDB("data")
|
|
|
sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
|
|
|
unique_code,sys_user_id,sys_user_real_name
|
|
|
- FROM excel_info where is_delete=0 AND source = ? ORDER BY sort asc,create_time desc `
|
|
|
- _, err = o.Raw(sql, source).QueryRows(&items)
|
|
|
+ FROM excel_info where is_delete=0 AND source = ? `
|
|
|
+
|
|
|
+ if userId > 0 {
|
|
|
+ sql += ` AND sys_user_id = ? `
|
|
|
+ }
|
|
|
+ sql += ` ORDER BY sort asc,create_time desc `
|
|
|
+ _, err = o.Raw(sql, source, userId).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
|
|