Merge remote-tracking branch 'origin/test' into test

@@ -381,17 +381,17 @@ func (d *StaffAssessDao) useTStaffAssess(companyId int, cycleId int, userId int,
 	params := []interface{}{
 	params := []interface{}{
 		companyId, userId, cycleId, hrbp, cycleId, userId, cycleId,
 		companyId, userId, cycleId, hrbp, cycleId, userId, cycleId,
 	}
 	}
-
+	extWhere := ""
 	if len(beginDay) > 0 {
 	if len(beginDay) > 0 {
 		str := fmt.Sprintf(staffAssessWhere["beginDay"]+"\n", beginDay)
 		str := fmt.Sprintf(staffAssessWhere["beginDay"]+"\n", beginDay)
-		params = append(params, str)
+		extWhere += str
 	}
 	}
 
 
 	if len(assessType) > 0 {
 	if len(assessType) > 0 {
 		str := fmt.Sprintf(staffAssessWhere["assessType"]+"\n", assessType)
 		str := fmt.Sprintf(staffAssessWhere["assessType"]+"\n", assessType)
-		params = append(params, str)
+		extWhere += str
 	}
 	}
-	params = append(params, limit, offset)
+	params = append(params, extWhere, limit, offset)
 	sqlstr = fmt.Sprintf(sqlstr, params...)
 	sqlstr = fmt.Sprintf(sqlstr, params...)
 	return sqlstr
 	return sqlstr
 }
 }