|
@@ -176,7 +176,7 @@ func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems,
|
|
|
}
|
|
|
|
|
|
|
|
|
-func GetBalanceNoContentExcelInfoAll(source int, excelInfoIds []int) (items []*ExcelClassifyItems, err error) {
|
|
|
+func GetBalanceNoContentExcelInfoAll(source int, excelInfoIds []int, 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,sort,is_join_permission
|
|
@@ -184,9 +184,14 @@ func GetBalanceNoContentExcelInfoAll(source int, excelInfoIds []int) (items []*E
|
|
|
|
|
|
pars := []interface{}{source}
|
|
|
|
|
|
- if len(excelInfoIds) > 0 {
|
|
|
- sql += ` AND excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `)`
|
|
|
- pars = append(pars, excelInfoIds)
|
|
|
+ if userId > 0 {
|
|
|
+ if len(excelInfoIds) > 0 {
|
|
|
+ sql += ` AND (excel_info_id in (` + utils.GetOrmInReplace(len(excelInfoIds)) + `) or sys_user_id = ?)`
|
|
|
+ pars = append(pars, excelInfoIds, userId)
|
|
|
+ } else {
|
|
|
+ sql += ` AND sys_user_id = ? `
|
|
|
+ pars = append(pars, userId)
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
sql += ` ORDER BY sort asc,excel_info_id desc `
|