|
@@ -1246,6 +1246,9 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
|
|
|
startSize = paging.StartIndex(currentIndex, pageSize)
|
|
|
|
|
|
subClassify, _ := this.GetBool("SubClassify")
|
|
|
+ sources := this.GetString("Sources")
|
|
|
+ keyWord := this.GetString("KeyWord")
|
|
|
+ sysUserIds := this.GetString("SysUserIds")
|
|
|
classifyIdsStr := this.GetString("ClassifyIds")
|
|
|
classifyIds := strings.Split(classifyIdsStr, ",")
|
|
|
|
|
@@ -1294,6 +1297,31 @@ func (this *EdbInfoController) ClassifyEdbInfoList() {
|
|
|
pars = append(pars, finalClassifyIds)
|
|
|
}
|
|
|
}
|
|
|
+ if keyWord != "" {
|
|
|
+ condition += ` AND edb_name LIKE '%` + keyWord + `%' `
|
|
|
+ }
|
|
|
+ if sources != "" {
|
|
|
+ condition += " AND source_id IN(" + utils.GetOrmInReplace(len(strings.Split(sources, ","))) + ") "
|
|
|
+ pars = append(pars, strings.Split(sources, ","))
|
|
|
+ }
|
|
|
+ if sysUserIds != "" {
|
|
|
+ adminIds := strings.Split(sysUserIds, ",")
|
|
|
+ if len(adminIds) == 0 {
|
|
|
+ br.Msg = "请选择正确的创建人"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ adminIdsSlice := make([]int, 0)
|
|
|
+ for _, adminId := range adminIds {
|
|
|
+ adminIdInt, e := strconv.Atoi(adminId)
|
|
|
+ if e != nil {
|
|
|
+ br.Msg = "请选择正确的创建人"
|
|
|
+ return
|
|
|
+ }
|
|
|
+ adminIdsSlice = append(adminIdsSlice, adminIdInt)
|
|
|
+ }
|
|
|
+ condition += " AND sys_user_id in (" + utils.GetOrmInReplace(len(adminIds)) + ") "
|
|
|
+ pars = append(pars, adminIdsSlice)
|
|
|
+ }
|
|
|
|
|
|
count, err := data_manage.GetEdbInfoByConditionCount(condition, pars)
|
|
|
if err != nil && err.Error() != utils.ErrNoRow() {
|