Merge remote-tracking branch 'origin/master' into debug

models/data_manage/excel/excel_edb_mapping.go

@@ -191,7 +191,7 @@ func GetCountRelationExcelEdbInfoListMappingByCondition(condition string, pars [
 func GetUserIdListRelationExcelEdbInfoListMappingByCondition(condition string, pars []interface{}) (userIdList []int, err error) {
 	o := global.DmSQL["data"]
 	sql := ` SELECT b.sys_user_id FROM excel_edb_mapping AS a 
-	JOIN excel_info AS b on a.excel_info_id = b.excel_info_id WHERE 1=1 `
+	JOIN excel_info AS b on a.excel_info_id = b.excel_info_id WHERE 1=1 AND b.is_delete=0`
 	if condition != "" {
 		sql += condition
 	}